Commit 654f0e96 authored by Vasil Dimov's avatar Vasil Dimov

Fix Bug#58279 Incorrect enabling of UNIV_DEBUG in debug builds

Checking "IF(WITH_DEBUG)" does not work for multi-configuration CMake
generators like VS or XCode. See
http://forge.mysql.com/wiki/CMake#Debug-only_options
parent ccde86fd
...@@ -40,10 +40,9 @@ IF(UNIX) ...@@ -40,10 +40,9 @@ IF(UNIX)
ENDIF() ENDIF()
ENDIF() ENDIF()
# Enable InnoDB's UNIV_DEBUG if MySQL's WITH_DEBUG is defined # Enable InnoDB's UNIV_DEBUG for debug builds
IF(WITH_DEBUG) SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DUNIV_DEBUG")
ADD_DEFINITIONS("-DUNIV_DEBUG") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DUNIV_DEBUG")
ENDIF()
IF(NOT MSVC) IF(NOT MSVC)
# either define HAVE_IB_GCC_ATOMIC_BUILTINS or not # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment