forked from osmocom/wireshark
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>
This commit is contained in:
parent
08754c3893
commit
b6bec7d1fd
|
@ -263,18 +263,27 @@ set(LIBWIRESHARK_CLEAN_FILES
|
||||||
${LIBWIRESHARK_FILES}
|
${LIBWIRESHARK_FILES}
|
||||||
)
|
)
|
||||||
|
|
||||||
add_lex_files(LEX_FILES GENERATED_FILES
|
add_lex_files(LEX_FILES CLEAN_GENERATED_FILES
|
||||||
diam_dict.l
|
diam_dict.l
|
||||||
dtd_parse.l
|
dtd_parse.l
|
||||||
dtd_preparse.l
|
dtd_preparse.l
|
||||||
radius_dict.l
|
|
||||||
uat_load.l
|
uat_load.l
|
||||||
)
|
)
|
||||||
|
#
|
||||||
|
# There's still a warning when we clean up generated value_strings,
|
||||||
|
# because the string pointer is a const pointer, but it's allocated
|
||||||
|
# and we free it
|
||||||
|
#
|
||||||
|
add_lex_files(LEX_FILES GENERATED_FILES
|
||||||
|
radius_dict.l
|
||||||
|
)
|
||||||
|
|
||||||
add_lemon_files(LEMON_FILES GENERATED_FILES
|
add_lemon_files(LEMON_FILES CLEAN_GENERATED_FILES
|
||||||
dtd_grammar.lemon
|
dtd_grammar.lemon
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(GENERATED_FILES ${GENERATED_FILES} ${CLEAN_GENERATED_FILES})
|
||||||
|
|
||||||
set(epan_LIBS
|
set(epan_LIBS
|
||||||
wiretap
|
wiretap
|
||||||
wsutil
|
wsutil
|
||||||
|
@ -298,6 +307,7 @@ set(epan_LIBS
|
||||||
|
|
||||||
set(CLEAN_FILES
|
set(CLEAN_FILES
|
||||||
${LIBWIRESHARK_CLEAN_FILES}
|
${LIBWIRESHARK_CLEAN_FILES}
|
||||||
|
${CLEAN_GENERATED_FILES}
|
||||||
)
|
)
|
||||||
|
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
|
|
|
@ -31,7 +31,7 @@ set(DFILTER_PUBLIC_HEADERS
|
||||||
drange.h
|
drange.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(DFILTER_FILES
|
set(DFILTER_NONGENERATED_FILES
|
||||||
dfilter.c
|
dfilter.c
|
||||||
dfilter-macro.c
|
dfilter-macro.c
|
||||||
dfunctions.c
|
dfunctions.c
|
||||||
|
@ -48,26 +48,28 @@ set(DFILTER_FILES
|
||||||
sttype-test.c
|
sttype-test.c
|
||||||
syntax-tree.c
|
syntax-tree.c
|
||||||
)
|
)
|
||||||
source_group(dfilter FILES ${DFILTER_FILES})
|
source_group(dfilter FILES ${DFILTER_NONGENERATED_FILES})
|
||||||
|
|
||||||
|
set(DFILTER_FILES ${DFILTER_NONGENERATED_FILES})
|
||||||
|
|
||||||
|
add_lex_files(LEX_FILES DFILTER_FILES
|
||||||
|
scanner.l
|
||||||
|
)
|
||||||
|
|
||||||
|
add_lemon_files(LEMON_FILES DFILTER_FILES
|
||||||
|
grammar.lemon
|
||||||
|
)
|
||||||
|
|
||||||
|
#
|
||||||
|
# All files are warning-clean. (Let's keep it that way.)
|
||||||
|
#
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
${DFILTER_FILES}
|
${DFILTER_FILES}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
|
COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
|
||||||
)
|
)
|
||||||
|
|
||||||
add_lex_files(LEX_FILES GENERATED_FILES
|
add_library(dfilter OBJECT ${DFILTER_FILES})
|
||||||
scanner.l
|
|
||||||
)
|
|
||||||
|
|
||||||
add_lemon_files(LEMON_FILES GENERATED_FILES
|
|
||||||
grammar.lemon
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(dfilter OBJECT
|
|
||||||
${DFILTER_FILES}
|
|
||||||
${GENERATED_FILES}
|
|
||||||
)
|
|
||||||
|
|
||||||
set_target_properties(dfilter PROPERTIES
|
set_target_properties(dfilter PROPERTIES
|
||||||
FOLDER "Libs/epan/dfilter"
|
FOLDER "Libs/epan/dfilter"
|
||||||
|
@ -86,7 +88,7 @@ CHECKAPI(
|
||||||
SWITCHES
|
SWITCHES
|
||||||
-g termoutput -build
|
-g termoutput -build
|
||||||
SOURCES
|
SOURCES
|
||||||
${DFILTER_FILES}
|
${DFILTER_NONGENERATED_FILES}
|
||||||
# LEX files commented out due to use of malloc, free etc.
|
# LEX files commented out due to use of malloc, free etc.
|
||||||
# ${LEX_FILES}
|
# ${LEX_FILES}
|
||||||
${LEMON_FILES}
|
${LEMON_FILES}
|
||||||
|
|
|
@ -30,7 +30,7 @@ set(WIRETAP_PUBLIC_HEADERS
|
||||||
wtap_opttypes.h
|
wtap_opttypes.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(WIRETAP_FILES
|
set(WIRETAP_NONGENERATED_FILES
|
||||||
5views.c
|
5views.c
|
||||||
aethra.c
|
aethra.c
|
||||||
ascendtext.c
|
ascendtext.c
|
||||||
|
@ -93,21 +93,26 @@ set(WIRETAP_FILES
|
||||||
${CMAKE_SOURCE_DIR}/version_info.c
|
${CMAKE_SOURCE_DIR}/version_info.c
|
||||||
)
|
)
|
||||||
|
|
||||||
set_source_files_properties(
|
set(WIRETAP_FILES ${WIRETAP_NONGENERATED_FILES})
|
||||||
${WIRETAP_FILES}
|
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
|
|
||||||
)
|
|
||||||
|
|
||||||
add_lex_files(LEX_FILES GENERATED_FILES
|
add_lex_files(LEX_FILES WIRETAP_FILES
|
||||||
ascend_scanner.l
|
ascend_scanner.l
|
||||||
k12text.l
|
k12text.l
|
||||||
)
|
)
|
||||||
|
|
||||||
add_yacc_files(YACC_FILES GENERATED_FILES
|
add_yacc_files(YACC_FILES WIRETAP_FILES
|
||||||
ascend.y
|
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
|
set(wiretap_LIBS
|
||||||
${GLIB2_LIBRARIES}
|
${GLIB2_LIBRARIES}
|
||||||
${GMODULE2_LIBRARIES}
|
${GMODULE2_LIBRARIES}
|
||||||
|
@ -117,7 +122,6 @@ set(wiretap_LIBS
|
||||||
|
|
||||||
add_library(wiretap
|
add_library(wiretap
|
||||||
${WIRETAP_FILES}
|
${WIRETAP_FILES}
|
||||||
${GENERATED_FILES}
|
|
||||||
${CMAKE_BINARY_DIR}/image/wiretap.rc
|
${CMAKE_BINARY_DIR}/image/wiretap.rc
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -173,7 +177,7 @@ CHECKAPI(
|
||||||
## -g abort -g termoutput
|
## -g abort -g termoutput
|
||||||
-g termoutput -build
|
-g termoutput -build
|
||||||
SOURCES
|
SOURCES
|
||||||
${WIRETAP_FILES}
|
${WIRETAP_NONGENERATED_FILES}
|
||||||
# LEX files commented out due to use of malloc, free etc.
|
# LEX files commented out due to use of malloc, free etc.
|
||||||
# ${LEX_FILES}
|
# ${LEX_FILES}
|
||||||
${YACC_FILES}
|
${YACC_FILES}
|
||||||
|
|
Loading…
Reference in New Issue