From 459bd4646d15c56b14f9f10d86c6f5d342174c98 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 16 Feb 2018 18:22:31 -0800 Subject: Don't have CLEAN_FILES variables for the "clean" source files. Except for the one directory that (currently) has "not yet clean" files, epan/dissectors, we don't need a separate variable to keep track of the "clean" source files. In the cases where not all files were in CLEAN_FILES, put them into the variable used to enable -Werror or its equivalent. Change-Id: Ic4119861c1d9e381adfe31e9977e1ac71d623f5b Reviewed-on: https://code.wireshark.org/review/25830 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- capchild/CMakeLists.txt | 6 +----- caputils/CMakeLists.txt | 6 +----- plugins/epan/ethercat/CMakeLists.txt | 6 +----- plugins/epan/gryphon/CMakeLists.txt | 6 +----- plugins/epan/irda/CMakeLists.txt | 6 +----- plugins/epan/mate/CMakeLists.txt | 12 +----------- plugins/epan/opcua/CMakeLists.txt | 6 +----- plugins/epan/pluginifdemo/CMakeLists.txt | 12 +++--------- plugins/epan/profinet/CMakeLists.txt | 6 +----- plugins/epan/stats_tree/CMakeLists.txt | 8 ++------ plugins/epan/transum/CMakeLists.txt | 6 +----- plugins/epan/unistim/CMakeLists.txt | 6 +----- plugins/epan/wimax/CMakeLists.txt | 6 +----- plugins/epan/wimaxasncp/CMakeLists.txt | 11 +++-------- plugins/epan/wimaxmacphy/CMakeLists.txt | 6 +----- plugins/wiretap/usbdump/CMakeLists.txt | 6 +----- randpkt_core/CMakeLists.txt | 6 +----- tools/lemon/CMakeLists.txt | 6 +----- ui/CMakeLists.txt | 27 ++++++++++----------------- ui/gtk/CMakeLists.txt | 27 +++++++++++++-------------- writecap/CMakeLists.txt | 6 +----- wsutil/CMakeLists.txt | 6 +----- 22 files changed, 48 insertions(+), 145 deletions(-) diff --git a/capchild/CMakeLists.txt b/capchild/CMakeLists.txt index 1a71b4f6a8..92bbbb8f6f 100644 --- a/capchild/CMakeLists.txt +++ b/capchild/CMakeLists.txt @@ -26,12 +26,8 @@ set(CAPCHILD_SRC capture_sync.c ) -set(CLEAN_FILES - ${CAPCHILD_SRC} -) - set_source_files_properties( - ${CLEAN_FILES} + ${CAPCHILD_SRC} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/caputils/CMakeLists.txt b/caputils/CMakeLists.txt index ec0c6a7c47..ef1cfebee0 100644 --- a/caputils/CMakeLists.txt +++ b/caputils/CMakeLists.txt @@ -48,12 +48,8 @@ if (AIRPCAP_FOUND) ) endif() -set(CLEAN_FILES - ${CAPUTILS_SRC} -) - set_source_files_properties( - ${CLEAN_FILES} + ${CAPUTILS_SRC} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/ethercat/CMakeLists.txt b/plugins/epan/ethercat/CMakeLists.txt index 6dc62fdf9d..3b68d81df4 100644 --- a/plugins/epan/ethercat/CMakeLists.txt +++ b/plugins/epan/ethercat/CMakeLists.txt @@ -39,12 +39,8 @@ set(PLUGIN_FILES ${DISSECTOR_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/gryphon/CMakeLists.txt b/plugins/epan/gryphon/CMakeLists.txt index 3e19f43eaf..cb67da4c26 100644 --- a/plugins/epan/gryphon/CMakeLists.txt +++ b/plugins/epan/gryphon/CMakeLists.txt @@ -33,12 +33,8 @@ set(PLUGIN_FILES ${DISSECTOR_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/irda/CMakeLists.txt b/plugins/epan/irda/CMakeLists.txt index a67568cbb3..4a0307199e 100644 --- a/plugins/epan/irda/CMakeLists.txt +++ b/plugins/epan/irda/CMakeLists.txt @@ -35,12 +35,8 @@ set(PLUGIN_FILES ${DISSECTOR_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/mate/CMakeLists.txt b/plugins/epan/mate/CMakeLists.txt index 6440f01b41..5a3f81ded7 100644 --- a/plugins/epan/mate/CMakeLists.txt +++ b/plugins/epan/mate/CMakeLists.txt @@ -36,10 +36,6 @@ set(DISSECTOR_SUPPORT_SRC include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -set(DISSECTOR_SUPPORT_CLEAN_SRC - ${DISSECTOR_SUPPORT_SRC} -) - add_lemon_files(LEMON_FILES GENERATED_FILES mate_grammar.lemon ) @@ -54,14 +50,8 @@ set(PLUGIN_FILES ${GENERATED_FILES} ) -set(CLEAN_FILES - plugin.c - ${DISSECTOR_SRC} - ${DISSECTOR_SUPPORT_CLEAN_SRC} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/opcua/CMakeLists.txt b/plugins/epan/opcua/CMakeLists.txt index 9473ef1444..6ff5b41a0b 100644 --- a/plugins/epan/opcua/CMakeLists.txt +++ b/plugins/epan/opcua/CMakeLists.txt @@ -48,12 +48,8 @@ set(PLUGIN_FILES ${DISSECTOR_SUPPORT_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/pluginifdemo/CMakeLists.txt b/plugins/epan/pluginifdemo/CMakeLists.txt index 341682aa3a..7237309f1e 100644 --- a/plugins/epan/pluginifdemo/CMakeLists.txt +++ b/plugins/epan/pluginifdemo/CMakeLists.txt @@ -45,18 +45,12 @@ set(PLUGIN_FILES ${DISSECTOR_SRC} ) -set(CLEAN_FILES +set_source_files_properties( ${PLUGIN_FILES} + PROPERTIES + COMPILE_FLAGS ${WERROR_COMMON_FLAGS} ) -if (WERROR_COMMON_FLAGS) - set_source_files_properties( - ${CLEAN_FILES} - PROPERTIES - COMPILE_FLAGS ${WERROR_COMMON_FLAGS} - ) -endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/plugins/epan/profinet/CMakeLists.txt b/plugins/epan/profinet/CMakeLists.txt index 581c6f9f73..792076b6ef 100644 --- a/plugins/epan/profinet/CMakeLists.txt +++ b/plugins/epan/profinet/CMakeLists.txt @@ -46,12 +46,8 @@ set(PLUGIN_FILES ${DISSECTOR_SUPPORT_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/stats_tree/CMakeLists.txt b/plugins/epan/stats_tree/CMakeLists.txt index 27cff79021..01f032594d 100644 --- a/plugins/epan/stats_tree/CMakeLists.txt +++ b/plugins/epan/stats_tree/CMakeLists.txt @@ -29,12 +29,8 @@ set(PLUGIN_FILES pinfo_stats_tree.c ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) @@ -52,7 +48,7 @@ CHECKAPI( SWITCHES -g abort -g termoutput -build SOURCES - ${CLEAN_FILES} + ${PLUGIN_FILES} ${PLUGIN_HEADERS} ) diff --git a/plugins/epan/transum/CMakeLists.txt b/plugins/epan/transum/CMakeLists.txt index 18eb54bd7c..7a205c56f1 100644 --- a/plugins/epan/transum/CMakeLists.txt +++ b/plugins/epan/transum/CMakeLists.txt @@ -39,12 +39,8 @@ set(PLUGIN_FILES ${DISSECTOR_SUPPORT_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/unistim/CMakeLists.txt b/plugins/epan/unistim/CMakeLists.txt index 6aeb7b84ef..6f6b26a0b4 100644 --- a/plugins/epan/unistim/CMakeLists.txt +++ b/plugins/epan/unistim/CMakeLists.txt @@ -33,12 +33,8 @@ set(PLUGIN_FILES ${DISSECTOR_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/wimax/CMakeLists.txt b/plugins/epan/wimax/CMakeLists.txt index 9419415cfc..84a9e69d7e 100644 --- a/plugins/epan/wimax/CMakeLists.txt +++ b/plugins/epan/wimax/CMakeLists.txt @@ -79,12 +79,8 @@ set(PLUGIN_FILES ${DISSECTOR_SUPPORT_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/epan/wimaxasncp/CMakeLists.txt b/plugins/epan/wimaxasncp/CMakeLists.txt index 3698520775..f56f127be1 100644 --- a/plugins/epan/wimaxasncp/CMakeLists.txt +++ b/plugins/epan/wimaxasncp/CMakeLists.txt @@ -33,21 +33,16 @@ set(PLUGIN_FILES ${DISSECTOR_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} +add_lex_files(LEX_FILES PLUGIN_FILES + wimaxasncp_dict.l ) set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) -add_lex_files(LEX_FILES GENERATED_FILES - wimaxasncp_dict.l -) -list(APPEND PLUGIN_FILES ${GENERATED_FILES}) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}) register_plugin_files(plugin.c diff --git a/plugins/epan/wimaxmacphy/CMakeLists.txt b/plugins/epan/wimaxmacphy/CMakeLists.txt index efd819db18..c8bd03e49f 100644 --- a/plugins/epan/wimaxmacphy/CMakeLists.txt +++ b/plugins/epan/wimaxmacphy/CMakeLists.txt @@ -33,12 +33,8 @@ set(PLUGIN_FILES ${DISSECTOR_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/plugins/wiretap/usbdump/CMakeLists.txt b/plugins/wiretap/usbdump/CMakeLists.txt index 2c6b22af8e..9aae128b10 100644 --- a/plugins/wiretap/usbdump/CMakeLists.txt +++ b/plugins/wiretap/usbdump/CMakeLists.txt @@ -21,12 +21,8 @@ set(PLUGIN_FILES ${WIRETAP_SRC} ) -set(CLEAN_FILES - ${PLUGIN_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${PLUGIN_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/randpkt_core/CMakeLists.txt b/randpkt_core/CMakeLists.txt index f7d5069e8d..331198679a 100644 --- a/randpkt_core/CMakeLists.txt +++ b/randpkt_core/CMakeLists.txt @@ -24,12 +24,8 @@ set(RANDPKT_CORE_SRC randpkt_core.c ) -set(CLEAN_FILES - ${RANDPKT_CORE_SRC} -) - set_source_files_properties( - ${CLEAN_FILES} + ${RANDPKT_CORE_SRC} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/tools/lemon/CMakeLists.txt b/tools/lemon/CMakeLists.txt index a598e820b6..1cfecd8711 100644 --- a/tools/lemon/CMakeLists.txt +++ b/tools/lemon/CMakeLists.txt @@ -23,12 +23,8 @@ set(lemon_FILES lemon.c ) -set(CLEAN_FILES - ${lemon_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${lemon_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS} ${NO_SANITIZE_CFLAGS}" ) diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index ea78f7830c..6c4d2c6944 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -set(COMMON_UI_SRC +set(NONGENERATED_UI_SRC alert_box.c capture.c capture_ui_utils.c @@ -73,25 +73,20 @@ file(GLOB EXTRA_UI_HEADERS tap-rtp-analysis.h ) -add_lex_files(LEX_FILES GENERATED_FILES - text_import_scanner.l -) +set(UI_SRC ${NONGENERATED_UI_SRC}) -set(CLEAN_FILES - ${COMMON_UI_SRC} +add_lex_files(LEX_FILES UI_SRC + text_import_scanner.l ) set_source_files_properties( - ${CLEAN_FILES} + ${UI_SRC} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) -add_library(ui STATIC - ${COMMON_UI_SRC} - ${GENERATED_FILES} -) +add_library(ui STATIC ${UI_SRC}) set_target_properties(ui PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}" @@ -115,9 +110,8 @@ CHECKAPI( SWITCHES -g deprecated-gtk SOURCES - ${COMMON_UI_SRC} -# LEX files commented out due to use of malloc, free etc. -# ${LEX_FILES} + ${NONGENERATED_UI_SRC} +# Flex files not included due to use of malloc, free etc. ) CHECKAPI( NAME @@ -125,9 +119,8 @@ CHECKAPI( SWITCHES -M -g deprecated-gtk-todo SOURCES - ${COMMON_UI_SRC} -# LEX files commented out due to use of malloc, free etc. -# ${LEX_FILES} + ${NONGENERATED_UI_SRC} +# Flex files not included due to use of malloc, free etc. ) # diff --git a/ui/gtk/CMakeLists.txt b/ui/gtk/CMakeLists.txt index cc6b01e89e..173f02780c 100644 --- a/ui/gtk/CMakeLists.txt +++ b/ui/gtk/CMakeLists.txt @@ -218,17 +218,6 @@ set(WIRESHARK_TAP_SRC ${WIRESHARK_CUSTOM_TAP_SRC} ) -set(CLEAN_FILES - ${WIRESHARK_GTK_SRC} - ${WIRESHARK_TAP_SRC} -) - -set_source_files_properties( - ${CLEAN_FILES} - PROPERTIES - COMPILE_FLAGS "${WERROR_COMMON_FLAGS} ${NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS}" -) - if (ENABLE_GTK3) add_definitions( ${GTK3_DEFINITIONS} @@ -259,6 +248,18 @@ if(WIN32) ) endif() +set(GTKUI_FILES + ${WIRESHARK_GTK_SRC} + ${WIRESHARK_TAP_SRC} + ${PLATFORM_UI_SRC} +) + +set_source_files_properties( + ${GTKUI_FILES} + PROPERTIES + COMPILE_FLAGS "${WERROR_COMMON_FLAGS} ${NO_ERROR_DEPRECATED_DECLARATIONS_COMPILE_FLAGS}" +) + register_tap_files(wireshark-tap-register.c ${WIRESHARK_TAP_SRC} ) @@ -303,9 +304,7 @@ else() endif() add_library(gtkui STATIC - ${WIRESHARK_GTK_SRC} - ${WIRESHARK_TAP_SRC} - ${PLATFORM_UI_SRC} + ${GTKUI_FILES} ${PORTAUDIO_OBJ} wireshark-tap-register.c ${PIXBUF_SRC} diff --git a/writecap/CMakeLists.txt b/writecap/CMakeLists.txt index 8d6ce4b88f..de2ff74396 100644 --- a/writecap/CMakeLists.txt +++ b/writecap/CMakeLists.txt @@ -23,12 +23,8 @@ set(WRITECAP_SRC pcapio.c ) -set(CLEAN_FILES - ${WRITECAP_SRC} -) - set_source_files_properties( - ${CLEAN_FILES} + ${WRITECAP_SRC} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt index 407d27a2dd..bb75fd4dfd 100644 --- a/wsutil/CMakeLists.txt +++ b/wsutil/CMakeLists.txt @@ -248,12 +248,8 @@ IF(WIN32) set(wsutil_LIBS ${wsutil_LIBS} "iphlpapi.lib" "ws2_32.lib") ENDIF(WIN32) -set(CLEAN_FILES - ${WSUTIL_FILES} -) - set_source_files_properties( - ${CLEAN_FILES} + ${WSUTIL_FILES} PROPERTIES COMPILE_FLAGS "${WERROR_COMMON_FLAGS}" ) -- cgit v1.2.3