Don't treat radius_dict.l specially.

The warning it gets is for one of the extra warning flags, not turned on
by default, and is rather common (and hard to fix).

Change-Id: Icbc9156ab3862e5921d86b39b936754abe15968d
Reviewed-on: https://code.wireshark.org/review/25826
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 029d26d71df697555369ca66158cdbe632876bf9..5bd3d40e4e30ba2ec9e6a51e0ad034a0863d8403 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -173,7 +173,7 @@ set(LIBWIRESHARK_PUBLIC_HEADERS
        xdlc.h
 )
 
-set(LIBWIRESHARK_FILES
+set(LIBWIRESHARK_NONGENERATED_FILES
        addr_and_mask.c
        addr_resolv.c
        address_types.c
@@ -259,31 +259,20 @@ set(LIBWIRESHARK_FILES
        ${CMAKE_SOURCE_DIR}/version_info.c
 )
 
-set(LIBWIRESHARK_CLEAN_FILES
-       ${LIBWIRESHARK_FILES}
-)
+set(LIBWIRESHARK_FILES ${LIBWIRESHARK_NONGENERATED_FILES})
 
-add_lex_files(LEX_FILES CLEAN_GENERATED_FILES
+add_lex_files(LEX_FILES LIBWIRESHARK_FILES
        diam_dict.l
        dtd_parse.l
        dtd_preparse.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
+       uat_load.l
 )
 
-add_lemon_files(LEMON_FILES CLEAN_GENERATED_FILES
+add_lemon_files(LEMON_FILES LIBWIRESHARK_FILES
        dtd_grammar.lemon
 )
 
-set(GENERATED_FILES ${GENERATED_FILES} ${CLEAN_GENERATED_FILES})
-
 set(epan_LIBS
        wiretap
        wsutil
@@ -305,13 +294,8 @@ set(epan_LIBS
        ${LIBXML2_LIBRARIES}
 )
 
-set(CLEAN_FILES
-       ${LIBWIRESHARK_CLEAN_FILES}
-       ${CLEAN_GENERATED_FILES}
-)
-
 set_source_files_properties(
-       ${CLEAN_FILES}
+       ${LIBWIRESHARK_FILES}
        PROPERTIES
        COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
 )
@@ -325,7 +309,6 @@ else()
 endif()
 add_library(epan
        ${LIBWIRESHARK_FILES}
-       ${GENERATED_FILES}
        $<TARGET_OBJECTS:crypt>
        $<TARGET_OBJECTS:dfilter>
        $<TARGET_OBJECTS:dissectors>
@@ -450,7 +433,7 @@ CHECKAPI(
        SWITCHES
          -g termoutput -build
        SOURCES
-         ${LIBWIRESHARK_FILES}
+         ${LIBWIRESHARK_NONGENERATED_FILES}
 )
 
 #