diff options
| author | Chris Robinson <[email protected]> | 2014-08-16 19:57:56 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-08-16 19:57:56 -0700 |
| commit | 4a7e04add3e70b0dc1741bcad15f6c1058ca80d5 (patch) | |
| tree | a9582757a96cb2dbbd6292a39320334e33c99f4c | |
| parent | 8630e8c7fc0ee64baeff3e82411ad2445cab9f9b (diff) | |
Don't force specific compile flags for the different build types
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ca67eb75..408ba364 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,11 +214,6 @@ IF(NOT CMAKE_DEBUG_POSTFIX) ENDIF() IF(MSVC) - # ??? - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D_DEBUG") - SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG") - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_DEPRECATE) ADD_DEFINITIONS("/wd4098") @@ -262,18 +257,13 @@ ELSE() ADD_DEFINITIONS(-fPIC) ENDIF() - SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O2 -D_DEBUG" CACHE STRING - "Flags used by the compiler during Release with Debug Info builds." - FORCE) - SET(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG" CACHE STRING - "Flags used by the compiler during release minsize builds." - FORCE) - SET(CMAKE_C_FLAGS_RELEASE "-O2 -fomit-frame-pointer -DNDEBUG" CACHE STRING - "Flags used by the compiler during release builds" - FORCE) - SET(CMAKE_C_FLAGS_DEBUG "-g3 -D_DEBUG" CACHE STRING - "Flags used by the compiler during debug builds." - FORCE) + # We want RelWithDebInfo to actually include debug stuff (define _DEBUG + # instead of NDEBUG) + FOREACH(flag_var CMAKE_C_FLAGS_RELWITHDEBINFO CMAKE_CXX_FLAGS_RELWITHDEBINFO) + IF(${flag_var} MATCHES "-DNDEBUG") + STRING(REGEX REPLACE "-DNDEBUG" "-D_DEBUG" ${flag_var} "${${flag_var}}") + ENDIF() + ENDFOREACH() CHECK_C_SOURCE_COMPILES("int foo() __attribute__((destructor)); int main() {return 0;}" HAVE_GCC_DESTRUCTOR) |