aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2018-02-15 19:38:36 -0800
committerGuy Harris <guy@alum.mit.edu>2018-02-16 06:20:15 +0000
commitb6bec7d1fdf537f12968276344e6191394249b8b (patch)
treebc8a2f725854ba38b5f5abb871f19c77cb3e781f /wiretap
parent08754c3893befe1bc2377b8b30abef00aa5e52d0 (diff)
Treat most Lex-generated and all Lemon-generated files as clean.
Now that we're suppressing warnings that come from Flex generating insufficiently fussy code, just treat many of the Lex-generated files as clean; we don't seem to be getting warnings from Lemon-generated ones. Change-Id: Ib53ced6d8cb80645234929afca343d047d30f7f7 Reviewed-on: https://code.wireshark.org/review/25813 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/CMakeLists.txt24
1 files changed, 14 insertions, 10 deletions
diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
index 79ab0901d0..a39d509046 100644
--- a/wiretap/CMakeLists.txt
+++ b/wiretap/CMakeLists.txt
@@ -30,7 +30,7 @@ set(WIRETAP_PUBLIC_HEADERS
wtap_opttypes.h
)
-set(WIRETAP_FILES
+set(WIRETAP_NONGENERATED_FILES
5views.c
aethra.c
ascendtext.c
@@ -93,21 +93,26 @@ set(WIRETAP_FILES
${CMAKE_SOURCE_DIR}/version_info.c
)
-set_source_files_properties(
- ${WIRETAP_FILES}
- PROPERTIES
- COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
-)
+set(WIRETAP_FILES ${WIRETAP_NONGENERATED_FILES})
-add_lex_files(LEX_FILES GENERATED_FILES
+add_lex_files(LEX_FILES WIRETAP_FILES
ascend_scanner.l
k12text.l
)
-add_yacc_files(YACC_FILES GENERATED_FILES
+add_yacc_files(YACC_FILES WIRETAP_FILES
ascend.y
)
+#
+# All files are warning-clean. (Let's keep it that way.)
+#
+set_source_files_properties(
+ ${WIRETAP_FILES}
+ PROPERTIES
+ COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
+)
+
set(wiretap_LIBS
${GLIB2_LIBRARIES}
${GMODULE2_LIBRARIES}
@@ -117,7 +122,6 @@ set(wiretap_LIBS
add_library(wiretap
${WIRETAP_FILES}
- ${GENERATED_FILES}
${CMAKE_BINARY_DIR}/image/wiretap.rc
)
@@ -173,7 +177,7 @@ CHECKAPI(
## -g abort -g termoutput
-g termoutput -build
SOURCES
- ${WIRETAP_FILES}
+ ${WIRETAP_NONGENERATED_FILES}
# LEX files commented out due to use of malloc, free etc.
# ${LEX_FILES}
${YACC_FILES}