diff options
author | Guy Harris <guy@alum.mit.edu> | 2018-02-16 18:22:31 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2018-02-17 02:50:24 +0000 |
commit | 459bd4646d15c56b14f9f10d86c6f5d342174c98 (patch) | |
tree | 31e71e4c72af3abe9806026a7c3cdc0a73340e85 /plugins | |
parent | 5f0d50690ae01427ae310e15989cbe3780a241ad (diff) |
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 <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/epan/ethercat/CMakeLists.txt | 6 | ||||
-rw-r--r-- | plugins/epan/gryphon/CMakeLists.txt | 6 | ||||
-rw-r--r-- | plugins/epan/irda/CMakeLists.txt | 6 | ||||
-rw-r--r-- | plugins/epan/mate/CMakeLists.txt | 12 | ||||
-rw-r--r-- | plugins/epan/opcua/CMakeLists.txt | 6 | ||||
-rw-r--r-- | plugins/epan/pluginifdemo/CMakeLists.txt | 12 | ||||
-rw-r--r-- | plugins/epan/profinet/CMakeLists.txt | 6 | ||||
-rw-r--r-- | plugins/epan/stats_tree/CMakeLists.txt | 8 | ||||
-rw-r--r-- | plugins/epan/transum/CMakeLists.txt | 6 | ||||
-rw-r--r-- | plugins/epan/unistim/CMakeLists.txt | 6 | ||||
-rw-r--r-- | plugins/epan/wimax/CMakeLists.txt | 6 | ||||
-rw-r--r-- | plugins/epan/wimaxasncp/CMakeLists.txt | 11 | ||||
-rw-r--r-- | plugins/epan/wimaxmacphy/CMakeLists.txt | 6 | ||||
-rw-r--r-- | plugins/wiretap/usbdump/CMakeLists.txt | 6 |
14 files changed, 19 insertions, 84 deletions
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}" ) |