diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2017-01-17 16:48:24 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2017-01-17 16:48:24 +0100 |
| commit | 01ea63b3cb967fbaf0f8a9dd74c359ba0084889a (patch) | |
| tree | fc0c694f07481b7c32a16ebc3f04c902be0ddb0c | |
| parent | 883211c0b09ecabf7e385fce532a9069211e833d (diff) | |
| download | mariadb-git-01ea63b3cb967fbaf0f8a9dd74c359ba0084889a.tar.gz | |
Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ON
Post-push fix.
Problem cmake without explicit build type was broken on windows.
Fix: do not test for build type, always extend CMAKE_C[XX]_FLAGS_DEBUG
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 66fcdb0a22e..ba5e60f6146 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,11 +252,9 @@ IF (WITH_ASAN) ENDIF() ENDIF() - -IF(CMAKE_BUILD_TYPE MATCHES "Debug" OR WITH_DEBUG) - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") -ENDIF() +# Always enable debug sync for debug builds. +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC") OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF) IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE) |