diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2017-01-17 10:06:04 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2017-01-17 10:06:04 +0100 |
| commit | 883211c0b09ecabf7e385fce532a9069211e833d (patch) | |
| tree | 7a3c5a6d47bc7f147ff209c95b25ba14571165c1 | |
| parent | 0acab3cef56c2730d791986d9fd1c8a011488c4f (diff) | |
| download | mariadb-git-883211c0b09ecabf7e385fce532a9069211e833d.tar.gz | |
Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ON
The combination cmake -DENABLE_DEBUG_SYNC=0 -DWITH_DEBUG=ON fails to build.
Fix: Remove option ENABLE_DEBUG_SYNC.
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1abfa95f8b3..66fcdb0a22e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -253,8 +253,7 @@ IF (WITH_ASAN) ENDIF() -OPTION(ENABLE_DEBUG_SYNC "Enable debug sync (debug builds only)" ON) -IF(ENABLE_DEBUG_SYNC) +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() |