cmake: make WERROR_COMMON_FLAGS a normal string

Instead of checking for the boolean "FALSE", just set an empty string.
This avoids the need to check for WERROR_COMMON_FLAGS before using it.

The transformation is the same for all files, remove
"if (WERROR_COMMON_FLAGS)" and "endif()", reindent and add quotes (since
we have a string here and not a list).

Modelines have been added where missing.

Change-Id: I0ab05ae507c51fa77336d49a99a226399cc81b92
Reviewed-on: https://code.wireshark.org/review/17997
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Dario Lombardo <lomato@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0530ee359e5ae0a35229d50a2f8ceb4f50403f1a..988ca8577e66b045f70b52f930d6f647b5b50219 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -595,10 +595,11 @@ if(ENABLE_ASAN)
        set(CMAKE_CXX_FLAGS "-fsanitize=address ${CMAKE_CXX_FLAGS}")
 endif()
 
+set(WERROR_COMMON_FLAGS "")
+set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS "")
 if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS)
        if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
                set(WERROR_COMMON_FLAGS "/WX")
-               set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS)
        else()
                check_c_compiler_flag(-Werror WERROR)
                if (WERROR)
@@ -606,8 +607,6 @@ if(NOT DISABLE_WERROR AND NOT ENABLE_EXTRA_COMPILER_WARNINGS)
                        set(NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS "-Wno-error=deprecated-declarations")
                endif()
        endif()
-else()
-       set(WERROR_COMMON_FLAGS FALSE)
 endif()
 
 #
@@ -2620,13 +2619,11 @@ set(CLEAN_FILES
        ${udpdump_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 install(
        FILES

diff --git a/capchild/CMakeLists.txt b/capchild/CMakeLists.txt
index af517063055354536a1fcb8147fa5511d7eb873d..b470a4db0882ec047bc98361a0733bf080a1023a 100644 (file)
--- a/capchild/CMakeLists.txt
+++ b/capchild/CMakeLists.txt
@@ -30,13 +30,11 @@ set(CLEAN_FILES
        ${CAPCHILD_SRC}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 file(GLOB CAPCHILD_HEADERS capture_session.h)
 
@@ -66,3 +64,16 @@ CHECKAPI(
        SOURCES
          ${CAPCHILD_SRC}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/caputils/CMakeLists.txt b/caputils/CMakeLists.txt
index c807fe04020de8c0f92b9822afec863da1221a39..453660149547ebc4c9f01aed43460f36f96b25ed 100644 (file)
--- a/caputils/CMakeLists.txt
+++ b/caputils/CMakeLists.txt
@@ -52,13 +52,11 @@ set(CLEAN_FILES
        ${CAPUTILS_SRC}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 
 add_library(caputils STATIC
@@ -86,3 +84,16 @@ CHECKAPI(
        SOURCES
          ${CAPUTILS_SRC}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/echld/CMakeLists.txt b/echld/CMakeLists.txt
index d32663ed50d260e1d72d9111a9ef8a77ae8c2b60..37db17fa68369ac8402ee4a3e4d9c4044d3148af 100644 (file)
--- a/echld/CMakeLists.txt
+++ b/echld/CMakeLists.txt
@@ -39,13 +39,11 @@ set(ECHLD_FILES
        ${DIRTY_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 
 add_library(echld ${LINK_MODE_LIB}
@@ -93,3 +91,16 @@ if(NOT ${ENABLE_STATIC})
                ARCHIVE DESTINATION lib
        )
 endif()
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 5cbd206d3d095a49f4dcf307d2f70bc0e20c0af7..25f8460d8c75dcf581c70f0a74e9e9fe8b0e5718 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -209,13 +209,11 @@ set(CLEAN_FILES
        ${LIBWIRESHARK_ASM_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 # Cannot use $<$<BOOL:${HAVE_LIBLUA}>:$<TARGET_OBJECTS:wslua>> as that breaks
 # get_target_property(_libwireshark_location epan LOCATION).

diff --git a/epan/crypt/CMakeLists.txt b/epan/crypt/CMakeLists.txt
index cb659c399886d5fb2bd3ce5afb2b7f749a200da4..a06aa604826d644d30626b393ea78057390119d6 100644 (file)
--- a/epan/crypt/CMakeLists.txt
+++ b/epan/crypt/CMakeLists.txt
@@ -35,13 +35,11 @@ set(CRYPT_FILES
 )
 source_group(crypt FILES ${CRYPT_FILES})
 
-if(WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CRYPT_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CRYPT_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_library(crypt OBJECT
        ${CRYPT_FILES}

diff --git a/epan/dfilter/CMakeLists.txt b/epan/dfilter/CMakeLists.txt
index b17fac891de5d97362bbddf522b39ce6e6a81c9f..b4eb5fb46d5c3db709ebeef5fe3a9c6e64f760b1 100644 (file)
--- a/epan/dfilter/CMakeLists.txt
+++ b/epan/dfilter/CMakeLists.txt
@@ -43,13 +43,11 @@ set(DFILTER_FILES
 )
 source_group(dfilter FILES ${DFILTER_FILES})
 
-if(WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${DFILTER_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${DFILTER_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_lex_files(LEX_FILES GENERATED_FILES
        scanner.l

diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 43a1ae23d77ce6e7f9bab2f9310c6b60768125c1..c7f86c983a90782209b7186212934fd45d622cb4 100644 (file)
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -1452,13 +1452,11 @@ set(CLEAN_FILES
        ${DISSECTOR_SUPPORT_SRC}
 )
 
-if(WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_library(dissectors OBJECT
        ${DISSECTOR_FILES}

diff --git a/epan/dissectors/dcerpc/CMakeLists.txt b/epan/dissectors/dcerpc/CMakeLists.txt
index 91ea454bf964d0d8d3e4094ae5b5c2f216cf948d..7ff0f5d678bdd317e0454e1396efa5510c85074c 100644 (file)
--- a/epan/dissectors/dcerpc/CMakeLists.txt
+++ b/epan/dissectors/dcerpc/CMakeLists.txt
@@ -33,13 +33,11 @@ set(CLEAN_FILES
        ${IDL2WRS_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_executable(idl2wrs ${IDL2WRS_FILES})
 set_target_properties(idl2wrs PROPERTIES FOLDER "Executables")

diff --git a/epan/ftypes/CMakeLists.txt b/epan/ftypes/CMakeLists.txt
index 32b313e5b978b836735d12a00958589aa3347acc..50df55c34b1907b7720697c5320d4dea2a229fc2 100644 (file)
--- a/epan/ftypes/CMakeLists.txt
+++ b/epan/ftypes/CMakeLists.txt
@@ -41,13 +41,11 @@ set(FTYPE_FILES
 )
 source_group(ftype FILES ${FTYPE_FILES})
 
-if(WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${FTYPE_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${FTYPE_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_library(ftypes OBJECT
        ${FTYPE_FILES}

diff --git a/epan/nghttp2/CMakeLists.txt b/epan/nghttp2/CMakeLists.txt
index 2166018228f28882254ef20903e87c13701b9a1d..9fb00ce584e054c12a647c1fe3b9616257963a9b 100644 (file)
--- a/epan/nghttp2/CMakeLists.txt
+++ b/epan/nghttp2/CMakeLists.txt
@@ -35,13 +35,11 @@ set(NGHTTP2_FILES
 )
 source_group(nghttp2 FILES ${NGHTTP2_FILES})
 
-if(WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${NGHTTP2_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${NGHTTP2_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_library(nghttp2 OBJECT
        ${NGHTTP2_FILES}

diff --git a/epan/wmem/CMakeLists.txt b/epan/wmem/CMakeLists.txt
index 52d798ad1868d98c2ca85d8887915ba883f6c3d6..70d2251f27060b4e080c78c09c36e2eba4e8200a 100644 (file)
--- a/epan/wmem/CMakeLists.txt
+++ b/epan/wmem/CMakeLists.txt
@@ -44,13 +44,11 @@ set(WMEM_FILES
 )
 source_group(wmem FILES ${WMEM_FILES})
 
-if(WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${WMEM_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${WMEM_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_library(wmem OBJECT
        ${WMEM_FILES}

diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index 3e1ceb8075d558b2b2de329f4258882328fcc9ff..6b200094afceeed99431cfd9578185af279318ce 100644 (file)
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -65,13 +65,11 @@ set(WSLUA_FILES
 )
 source_group(wslua FILES ${WSLUA_FILES})
 
-if(WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${WSLUA_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${WSLUA_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 # make-taps.pl depends on the current working directory
 # to find the dissector files (contents of taps file

diff --git a/plugins/docsis/CMakeLists.txt b/plugins/docsis/CMakeLists.txt
index 0f91e45a85226a5dc4a63111673d4ebbe822e988..0a19f6623a681f20cbde1148d59c449521c044d9 100644 (file)
--- a/plugins/docsis/CMakeLists.txt
+++ b/plugins/docsis/CMakeLists.txt
@@ -84,13 +84,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -117,3 +115,16 @@ CHECKAPI(
          ${DISSECTOR_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/ethercat/CMakeLists.txt b/plugins/ethercat/CMakeLists.txt
index c50d900f47cfbc4fdddf05670899bed2e7da6af9..c697d9bfb16dcd4ca8f92320e8137f5b17108513 100644 (file)
--- a/plugins/ethercat/CMakeLists.txt
+++ b/plugins/ethercat/CMakeLists.txt
@@ -43,13 +43,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -76,3 +74,16 @@ CHECKAPI(
          ${DISSECTOR_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/gryphon/CMakeLists.txt b/plugins/gryphon/CMakeLists.txt
index 352cddde3fd931ebe1b5768b285327b5dccfdf0f..be1d6177b9949ad80489be2632f974daf97ba553 100644 (file)
--- a/plugins/gryphon/CMakeLists.txt
+++ b/plugins/gryphon/CMakeLists.txt
@@ -37,13 +37,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -70,3 +68,16 @@ CHECKAPI(
          ${DISSECTOR_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/irda/CMakeLists.txt b/plugins/irda/CMakeLists.txt
index d035ab05d4699b7d1580e552674da0bc2e6769d3..f0e75ae7eac3ba9c00536b59dd598cd14ea0a67a 100644 (file)
--- a/plugins/irda/CMakeLists.txt
+++ b/plugins/irda/CMakeLists.txt
@@ -39,13 +39,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -72,3 +70,16 @@ CHECKAPI(
          ${DISSECTOR_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/m2m/CMakeLists.txt b/plugins/m2m/CMakeLists.txt
index 02a69da0c6aa83ca0dfdab8aaa945e7083e21319..6ee8f892932d1e7eb2b6a7de1fe04332b6754a6b 100644 (file)
--- a/plugins/m2m/CMakeLists.txt
+++ b/plugins/m2m/CMakeLists.txt
@@ -42,13 +42,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -77,3 +75,16 @@ CHECKAPI(
          ${DISSECTOR_SUPPORT_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/mate/CMakeLists.txt b/plugins/mate/CMakeLists.txt
index 16459c4c7a80a3019c6594f0775b1a37fe5e453c..3479bdd76dde3dd976621f6fe75c0768e5600740 100644 (file)
--- a/plugins/mate/CMakeLists.txt
+++ b/plugins/mate/CMakeLists.txt
@@ -60,13 +60,11 @@ set(CLEAN_FILES
        ${DISSECTOR_SUPPORT_CLEAN_SRC}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 register_dissector_files(plugin.c
        plugin
@@ -96,3 +94,16 @@ CHECKAPI(
 #        ${LEX_FILES}
          ${LEMON_FILES}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/opcua/CMakeLists.txt b/plugins/opcua/CMakeLists.txt
index cedeaeedb31df82a33805011cac7c33bca6084ee..4d63a0ec5a8a158293345ed75fb7e39a2078d9f3 100644 (file)
--- a/plugins/opcua/CMakeLists.txt
+++ b/plugins/opcua/CMakeLists.txt
@@ -52,13 +52,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -87,3 +85,16 @@ CHECKAPI(
          ${DISSECTOR_SUPPORT_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/profinet/CMakeLists.txt b/plugins/profinet/CMakeLists.txt
index 56bff2ad7437331d7f551b9d81bd3486fbbbf41d..b8f31f38a99c1a17a7f28eeb106111b5d3b8feb3 100644 (file)
--- a/plugins/profinet/CMakeLists.txt
+++ b/plugins/profinet/CMakeLists.txt
@@ -50,13 +50,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -85,3 +83,16 @@ CHECKAPI(
          ${DISSECTOR_SUPPORT_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/stats_tree/CMakeLists.txt b/plugins/stats_tree/CMakeLists.txt
index 60283123fdfeffd19aae7650d257c09ecffbd18c..014ee6ad2f4f971f020ffbd0f38cde908e380d5e 100644 (file)
--- a/plugins/stats_tree/CMakeLists.txt
+++ b/plugins/stats_tree/CMakeLists.txt
@@ -33,13 +33,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_plugin_library(stats_tree)
 
@@ -59,3 +57,16 @@ CHECKAPI(
          ${CLEAN_FILES}
          ${PLUGIN_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/tpg/CMakeLists.txt b/plugins/tpg/CMakeLists.txt
index adc99729b48761777053791f30abf84cebe2b4c1..cc888584cd765a521914891e10e8f94bd27bb46b 100644 (file)
--- a/plugins/tpg/CMakeLists.txt
+++ b/plugins/tpg/CMakeLists.txt
@@ -33,13 +33,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
@@ -79,3 +77,16 @@ install(TARGETS tpg
        RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/plugins/${CPACK_PACKAGE_VERSION}
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CPACK_PACKAGE_NAME}/plugins/${CPACK_PACKAGE_VERSION}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/unistim/CMakeLists.txt b/plugins/unistim/CMakeLists.txt
index b937e0987235f2b704d38152790d5c054d222e39..aea02ea2912f0226327785b463db346dffc1bab5 100644 (file)
--- a/plugins/unistim/CMakeLists.txt
+++ b/plugins/unistim/CMakeLists.txt
@@ -37,13 +37,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -70,3 +68,16 @@ CHECKAPI(
          ${DISSECTOR_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/wimax/CMakeLists.txt b/plugins/wimax/CMakeLists.txt
index f7cffbca189a7693f3cc43da99d6fff4917e4caa..b59b818ec39f286eab384330027067df871137b8 100644 (file)
--- a/plugins/wimax/CMakeLists.txt
+++ b/plugins/wimax/CMakeLists.txt
@@ -82,13 +82,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -117,3 +115,16 @@ CHECKAPI(
          ${DISSECTOR_SUPPORT_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/wimaxasncp/CMakeLists.txt b/plugins/wimaxasncp/CMakeLists.txt
index 277c2e379645e3268b42fac759f9df2ac24234ff..a5509e116c1a58813ebc75a2d1ab2bb9a94abfdd 100644 (file)
--- a/plugins/wimaxasncp/CMakeLists.txt
+++ b/plugins/wimaxasncp/CMakeLists.txt
@@ -37,13 +37,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_lex_files(LEX_FILES GENERATED_FILES
        wimaxasncp_dict.l
@@ -77,3 +75,16 @@ CHECKAPI(
 # LEX files commented out due to use of malloc, free etc.
 #        ${LEX_FILES}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/plugins/wimaxmacphy/CMakeLists.txt b/plugins/wimaxmacphy/CMakeLists.txt
index 344ebb0ed1e05ca5c93fd8da02f2699bbb7b4d22..686d10a1ef57a05a2426ba12183a164e85253021 100644 (file)
--- a/plugins/wimaxmacphy/CMakeLists.txt
+++ b/plugins/wimaxmacphy/CMakeLists.txt
@@ -37,13 +37,11 @@ set(CLEAN_FILES
        ${PLUGIN_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -70,3 +68,16 @@ CHECKAPI(
          ${DISSECTOR_SRC}
          ${DISSECTOR_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/randpkt_core/CMakeLists.txt b/randpkt_core/CMakeLists.txt
index 60775fd1bbe82cbf0a25d65edbb567e0953f1fc6..dc88b07e55fc14f9f6b9d2369381a6917058c9c5 100644 (file)
--- a/randpkt_core/CMakeLists.txt
+++ b/randpkt_core/CMakeLists.txt
@@ -28,13 +28,11 @@ set(CLEAN_FILES
        ${RANDPKT_CORE_SRC}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 file(GLOB RANDPKT_CORE_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" randpkt_core.h)
 
@@ -65,3 +63,16 @@ CHECKAPI(
          ${RANDPKT_CORE_SRC}
          ${RANDPKT_CORE_HEADERS}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt
index 3b44764c6ee37e6138694a5f4e7ee9f1ed433d72..bba72c345064d7b158deb131b88bae84537f896a 100644 (file)
--- a/tools/lemon/CMakeLists.txt
+++ b/tools/lemon/CMakeLists.txt
@@ -27,13 +27,11 @@ set(CLEAN_FILES
        ${lemon_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 set(lemon_LIBS
        # Do we need something here on any platform?
@@ -44,3 +42,16 @@ set_target_properties(lemon PROPERTIES FOLDER "tools")
 set_target_properties(lemon PROPERTIES COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}")
 
 target_link_libraries(lemon ${lemon_LIBS})
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index f2ab67529418bc613bfc943b5206ad5c547d0db3..334e5f325747b641bc34752d3cbb59f6f8ee218f 100644 (file)
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -80,13 +80,11 @@ set(CLEAN_FILES
        ${COMMON_UI_SRC}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 
 add_library(ui STATIC

diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt
index 806cc49842ea2e825ca40c1960bef5ba834aacdd..7864570d9d7bbf9fee07700c1528706bc0419f74 100644 (file)
--- a/ui/gtk/CMakeLists.txt
+++ b/ui/gtk/CMakeLists.txt
@@ -227,13 +227,11 @@ set(CLEAN_FILES
        ${WIRESHARK_TAP_SRC}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS "${WERROR_COMMON_FLAGS} ${NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS}"
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS} ${NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS}"
+)
 
 if (ENABLE_GTK3)
        add_definitions(

diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 5d7d06a223387692677032f21652d725aa3db931..84a2b44e1b95c8799d41360218a119381854edce 100644 (file)
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -508,13 +508,11 @@ add_custom_target(
 )
 set_target_properties(translations PROPERTIES FOLDER "UI")
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${WIRESHARK_QT_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${WIRESHARK_QT_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_definitions(${QT_DEFINITIONS})
 

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index bb89c5c4fb4e3aa68f42e03a0a72e8b6c119d933..5ff2f1ef39cf58b247e720ead39ab00750a36570 100644 (file)
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -84,13 +84,11 @@ set(WIRETAP_FILES
        ${CMAKE_SOURCE_DIR}/ws_version_info.c
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${WIRETAP_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${WIRETAP_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 add_lex_files(LEX_FILES GENERATED_FILES
        ascend_scanner.l
@@ -168,3 +166,16 @@ CHECKAPI(
 #        ${LEX_FILES}
          ${YACC_FILES}
 )
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/writecap/CMakeLists.txt b/writecap/CMakeLists.txt
index 642adddf4bd6c729521a934534b5e5fdb53b58dc..42483f93af61f4dc99064870bebefa5e328c2479 100644 (file)
--- a/writecap/CMakeLists.txt
+++ b/writecap/CMakeLists.txt
@@ -27,13 +27,11 @@ set(CLEAN_FILES
        ${WRITECAP_SRC}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 
 
 add_library(writecap STATIC
@@ -44,3 +42,16 @@ set_target_properties(writecap PROPERTIES
        COMPILE_OPTIONS "${WS_WARNINGS_C_FLAGS}"
        LINK_FLAGS "${WS_LINK_FLAGS}"
        FOLDER "Libs")
+
+#
+# Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 8
+# tab-width: 8
+# indent-tabs-mode: t
+# End:
+#
+# vi: set shiftwidth=8 tabstop=8 noexpandtab:
+# :indentSize=8:tabSize=8:noTabs=false:
+#

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 2f71d0fc727376d37eb633392250f6a8f70e9ab0..539126df04676e73cf6f655b45169344e20ad943 100644 (file)
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -189,33 +189,18 @@ set(CLEAN_FILES
        ${WSUTIL_FILES}
 )
 
-if (WERROR_COMMON_FLAGS)
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ${WERROR_COMMON_FLAGS}
-       )
-else()
-       #
-       # Set the property to an empty string, so that if we try
-       # to get it below, it succeeds.
-       #
-       set_source_files_properties(
-               ${CLEAN_FILES}
-               PROPERTIES
-               COMPILE_FLAGS ""
-       )
-endif()
+set_source_files_properties(
+       ${CLEAN_FILES}
+       PROPERTIES
+       COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
 if (HAVE_SSE4_2)
-       get_source_file_property(
-               WS_MEMPBRK_SSE42_COMPILE_FLAGS
-               ws_mempbrk_sse42.c
-               COMPILE_FLAGS
-       )
+       # TODO with CMake 2.8.12, we could use COMPILE_OPTIONS and just append
+       # instead of this COMPILE_FLAGS duplication...
        set_source_files_properties(
                ws_mempbrk_sse42.c
                PROPERTIES
-               COMPILE_FLAGS "${WS_MEMPBRK_SSE42_COMPILE_FLAGS} ${SSE4_2_FLAG}"
+               COMPILE_FLAGS "${WERROR_COMMON_FLAGS} ${SSE4_2_FLAG}"
        )
 endif()