diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2015-11-06 12:58:14 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2015-11-16 08:36:01 +0000 |
| commit | 442314e8b2bdc4ea921bd7136aadb851652f4ce7 (patch) | |
| tree | de6be1e9dfee67979e514f384d46c5734156f296 | |
| parent | 6c1ae95dc73585dba45c76c6eae33545cedfbedc (diff) | |
Revert "Override optimization and other flags for make based generators."
Some compiler flags may not be passed twice (such as -mllvm
-msan-keep-going), so avoid duplicating CMAKE_C(XX)_FLAGS.
When -DCMAKE_BUILD_TYPE=<type> is set, you can override the default
optimization and debug flags with -DCMAKE_C_FLAGS_<type>=....
This reverts commit 15a238a28d0dbfffe908a6451e411a64a34da678.
Change-Id: I4e1cf11c49eaf00ad4a2c430454a127b4be20d9e
Reviewed-on: https://code.wireshark.org/review/11597
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d75162d610..da295b1d50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -149,13 +149,6 @@ if( NOT CMAKE_BUILD_TYPE ) FORCE) endif() message(STATUS "Configuration types: ${CMAKE_CONFIGURATION_TYPES}") - -# Override optimization and other flags for make based generators -foreach (_BT DEBUG RELEASE RELWITHDEBINFO SIZEREL) - set( CMAKE_C_FLAGS_${_BT} "${CMAKE_C_FLAGS_${_BT}} ${CMAKE_C_FLAGS}" ) - set( CMAKE_CXX_FLAGS_${_BT} "${CMAKE_C_FLAGS_${_BT}} ${CMAKE_C_FLAGS}" ) -endforeach() - message(STATUS "${CMAKE_BUILD_TYPE}: ${CMAKE_C_FLAGS_RELWITHDEBINFO}") # Where to put executables and libraries in the build tree |