diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-06-13 17:14:25 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-06-14 06:42:39 +0000 |
| commit | 21b08ba8c8d35b1e923024b93937f27bbb6e7f50 (patch) | |
| tree | 84d0dc2a55a05ede24e6ca3fc1603d17c11cb958 /CMakeLists.txt | |
| parent | a6993d380657ae1bcca146673773e0fc82764747 (diff) | |
| download | wireshark-21b08ba8c8d35b1e923024b93937f27bbb6e7f50.tar.gz | |
Rename WIRESHARK_C_FLAGS to WIRESHARK_COMMON_FLAGS
Change-Id: If78801de797264c0924e81abaf8cd49cc5715a83
Reviewed-on: https://code.wireshark.org/review/2204
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bceff67901..9be715ce7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,13 +181,13 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC") # FIXME: WINPCAP_VERSION cannot be determined from source or executable. set(WINPCAP_VERSION "unknown") - set(WIRESHARK_C_FLAGS + set(WIRESHARK_COMMON_FLAGS "/DWINPCAP_VERSION=${WINPCAP_VERSION}" ${LOCAL_CFLAGS} ${WARNINGS_CFLAGS} ) else() - set(WIRESHARK_C_FLAGS + set(WIRESHARK_COMMON_FLAGS # -O<X> and -g get set by the CMAKE_BUILD_TYPE -Wall -W @@ -226,7 +226,7 @@ else() set(WIRESHARK_CPP_ONLY_FLAGS ) - set(WIRESHARK_EXTRA_COMPILER_C_FLAGS + set(WIRESHARK_EXTRA_COMPILER_COMMON_FLAGS -pedantic -Woverflow # @@ -294,12 +294,12 @@ else() # during real compiles if(CMAKE_C_COMPILER_ID MATCHES "Clang") - set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} + set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS} -Qunused-arguments #-fcolor-diagnostics ) else() - set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} + set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS} -fexcess-precision=fast ) @@ -308,7 +308,7 @@ else() endif() if(ENABLE_EXTRA_COMPILER_WARNINGS) # This overrides -Werror - set(WIRESHARK_C_FLAGS ${WIRESHARK_C_FLAGS} ${WIRESHARK_EXTRA_COMPILER_C_FLAGS}) + set(WIRESHARK_COMMON_FLAGS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_EXTRA_COMPILER_COMMON_FLAGS}) set(WIRESHARK_C_ONLY_FLAGS ${WIRESHARK_C_ONLY_FLAGS} ${WIRESHARK_EXTRA_COMPILER_C_ONLY_FLAGS}) set(WIRESHARK_CPP_ONLY_FLAGS ${WIRESHARK_CPP_ONLY_FLAGS} ${WIRESHARK_EXTRA_COMPILER_CPP_ONLY_FLAGS}) endif() @@ -319,8 +319,8 @@ else() ) endif() -set( C_FLAG_TESTS ${WIRESHARK_C_FLAGS} ${WIRESHARK_C_ONLY_FLAGS} ) -set( CPP_FLAG_TESTS ${WIRESHARK_C_FLAGS} ${WIRESHARK_CPP_ONLY_FLAGS} ) +set( C_FLAG_TESTS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_C_ONLY_FLAGS} ) +set( CPP_FLAG_TESTS ${WIRESHARK_COMMON_FLAGS} ${WIRESHARK_CPP_ONLY_FLAGS} ) # Counterhack to work around some cache magic in CHECK_C_SOURCE_COMPILES include(CheckCCompilerFlag) |