diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2014-06-30 17:56:28 +0200 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2014-07-03 08:04:10 +0000 |
| commit | a81265a1664d0dfc7e430c124aaf939da4ba7089 (patch) | |
| tree | 40200e37d63b281bdf264344704c140b6c2795de | |
| parent | fcea3cb042a837d3e9191eb6f1dd8eee214afa8c (diff) | |
| download | wireshark-a81265a1664d0dfc7e430c124aaf939da4ba7089.tar.gz | |
Allow overriding C/C++ flags from CMake command line
Append user's flags to our flags instead of prepending them to make
user flags higher priority.
Change-Id: I3ead33ee5fa06a2395d9197a027306ef99a704a2
Reviewed-on: https://code.wireshark.org/review/2722
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
(cherry picked from commit 65e3f5c25ee48e5b736ddbdf04fb2a31601ce8c1)
Reviewed-on: https://code.wireshark.org/review/2786
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a92dc5d89a..eb50acc07e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -344,9 +344,11 @@ foreach(THIS_FLAG ${C_FLAG_TESTS}) message(STATUS "Checking for c-compiler flag: ${THIS_FLAG}") check_c_compiler_flag(${${F}} ${V}) if (${${V}}) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${F}}") + set(ADDED_CMAKE_C_FLAGS "${ADDED_CMAKE_C_FLAGS} ${${F}}") endif() endforeach() +set(CMAKE_C_FLAGS "${ADDED_CMAKE_C_FLAGS} ${CMAKE_C_FLAGS}") + foreach(THIS_FLAG ${CPP_FLAG_TESTS}) string( REGEX REPLACE "[^a-zA-Z0-9_]+" "_" F ${THIS_FLAG} ) set(${F} ${THIS_FLAG}) @@ -354,9 +356,11 @@ foreach(THIS_FLAG ${CPP_FLAG_TESTS}) message(STATUS "Checking for c++-compiler flag: ${THIS_FLAG}") check_cxx_compiler_flag(${${F}} ${V}) if (${${V}}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${F}}") + set(ADDED_CMAKE_CXX_FLAGS "${ADDED_CMAKE_CXX_FLAGS} ${${F}}") endif() endforeach() +set(CMAKE_CXX_FLAGS "${ADDED_CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS}") + message(STATUS "C-Flags: ${CMAKE_C_FLAGS}\nCXX-Flags: ${CMAKE_CXX_FLAGS}") check_c_compiler_flag(-fvisibility=hidden FVHIDDEN) |