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 /ui/gtk | |
| 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 'ui/gtk')
| -rw-r--r-- | ui/gtk/CMakeLists.txt | 27 |
1 files changed, 13 insertions, 14 deletions
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} |