osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

CMake: Remove some redundant and overly verbose code 

The original reason for having a WARN_FLAGS set of variables has
been lost.

Change-Id: I3eae3cf9d0bad5f3895f6fee59c2c64183c8f244
Reviewed-on: https://code.wireshark.org/review/29526
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
João Valverde 2018-09-10 01:13:56 +01:00 committed by Anders Broman
parent ad6eb33684
commit 0d123e5a24
1 changed files with 82 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
CMakeLists.txt
View File

@ -470,7 +470,7 @@ else() # ! MSVC
)
endif()
set(COMMON_WARN_FLAGS
list(APPEND WIRESHARK_COMMON_FLAGS
# The following are for C and C++
# -O<X> and -g get set by the CMAKE_BUILD_TYPE
-Wall
@ -505,12 +505,12 @@ else() # ! MSVC
# the stack usage - we only care about stack
# usage in normal operation.
#
set(COMMON_WARN_FLAGS ${COMMON_WARN_FLAGS}
set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS}
-Wframe-larger-than=32768
)
endif()
set(C_WARN_FLAGS
list(APPEND WIRESHARK_C_ONLY_FLAGS
# The following are C only, not C++
-Wc++-compat
-Wunused-const-variable
@ -541,14 +541,15 @@ else() # ! MSVC
-Werror=implicit
)
set(CXX_WARN_FLAGS
list(APPEND WIRESHARK_CXX_ONLY_FLAGS
)
#
# These are not enabled by default, because the warnings they
# produce are very hard or impossible to eliminate.
#
set(COMMON_EXTRA_WARN_FLAGS
if(ENABLE_EXTRA_COMPILER_WARNINGS) # This overrides -Werror
list(APPEND WIRESHARK_COMMON_FLAGS
# The following are for C and C++
-Wpedantic
#
@ -612,7 +613,7 @@ else() # ! MSVC
-fno-delete-null-pointer-checks
)
set(C_EXTRA_WARN_FLAGS
list(APPEND WIRESHARK_C_ONLY_FLAGS
# The following are C only, not C++
#
# Due to various places where APIs we don't control
@ -622,13 +623,8 @@ else() # ! MSVC
-Wbad-function-cast
)
set(CXX_EXTRA_WARN_FLAGS
list(APPEND WIRESHARK_CXX_ONLY_FLAGS
)
if(ENABLE_EXTRA_COMPILER_WARNINGS) # This overrides -Werror
set(COMMON_WARN_FLAGS ${COMMON_WARN_FLAGS} ${COMMON_EXTRA_WARN_FLAGS})
set(C_WARN_FLAGS ${C_WARN_FLAGS} ${C_EXTRA_WARN_FLAGS})
set(CXX_WARN_FLAGS ${CXX_WARN_FLAGS} ${CXX_EXTRA_WARN_FLAGS})
endif()
add_definitions(
@ -647,12 +643,6 @@ else() # ! MSVC
)
endif() # ! MSVC
set( C_FLAG_TESTS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_C_ONLY_FLAGS} )
set( CXX_FLAG_TESTS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_CXX_ONLY_FLAGS} )
set( C_WARN_TESTS ${COMMON_WARN_FLAGS} ${C_WARN_FLAGS} )
set( CXX_WARN_TESTS ${COMMON_WARN_FLAGS} ${CXX_WARN_FLAGS} )
# Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES
include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
@ -678,26 +668,16 @@ function(test_compiler_flag _lang _this_flag _valid_flags_var)
endif()
endfunction()
foreach(THIS_FLAG ${C_FLAG_TESTS})
foreach(THIS_FLAG ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_C_ONLY_FLAGS})
test_compiler_flag(C ${THIS_FLAG} ADDED_CMAKE_C_FLAGS)
endforeach()
set(CMAKE_C_FLAGS "${ADDED_CMAKE_C_FLAGS} ${CMAKE_C_FLAGS}")
foreach(THIS_FLAG ${CXX_FLAG_TESTS})
foreach(THIS_FLAG ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_CXX_ONLY_FLAGS})
test_compiler_flag(CXX ${THIS_FLAG} ADDED_CMAKE_CXX_FLAGS)
endforeach()
set(CMAKE_CXX_FLAGS "${ADDED_CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
foreach(THIS_FLAG ${C_WARN_TESTS})
test_compiler_flag(C ${THIS_FLAG} ADDED_WARN_C_FLAGS)
endforeach()
set(CMAKE_C_FLAGS "${ADDED_WARN_C_FLAGS} ${CMAKE_C_FLAGS}")
foreach(THIS_FLAG ${CXX_WARN_TESTS})
test_compiler_flag(CXX ${THIS_FLAG} ADDED_WARN_CXX_FLAGS)
endforeach()
set(CMAKE_CXX_FLAGS "${ADDED_WARN_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
include(CMakePushCheckState)
if(ENABLE_ASAN)