diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-07-08 19:37:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-07-08 19:37:37 +0200 |
| commit | 7434de31ac1dac9c0c602c37a70349066a7d6925 (patch) | |
| tree | a88383d91ba5c6fcc7422679ff727cca68ba2e7d /CMakeLists.txt | |
| parent | 528c1111ad8ac116ba3fe2a4a640a1006f666338 (diff) | |
| download | mariadb-git-7434de31ac1dac9c0c602c37a70349066a7d6925.tar.gz | |
typo in CMakeLists.txt that caused USE_MYSYS_NEW to be set too early and incorrectly
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bad38462007..07f73056575 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -303,16 +303,11 @@ ENDIF() # safemalloc can be enabled and disabled independently SET(WITH_SAFEMALLOC "AUTO" CACHE STRING "Use safemalloc memory debugger. Will result in slower execution. Options are: ON OFF AUTO.") -# force -DUSE_MYSYS_NEW unless already done by HAVE_CXX_NEW -IF(HAVE_CXX_NEW) - SET(DUSE_MYSYS_NEW "-DUSE_MYSYS_NEW") -ENDIF() - IF(WITH_SAFEMALLOC MATCHES "ON") - ADD_DEFINITIONS( -DSAFEMALLOC ${DUSE_MYSYS_NEW}) + ADD_DEFINITIONS( -DSAFEMALLOC) ELSEIF(WITH_SAFEMALLOC MATCHES "AUTO" AND NOT WIN32 AND NOT WITH_VALGRIND) SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC ${DUSE_MYSYS_NEW}") + SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC") ENDIF() # Set commonly used variables @@ -350,6 +345,11 @@ ENDIF() # Run platform tests INCLUDE(configure.cmake) +# force -DUSE_MYSYS_NEW unless already done by HAVE_CXX_NEW +IF(NOT HAVE_CXX_NEW) + ADD_DEFINITIONS(-DUSE_MYSYS_NEW) +ENDIF() + # Find header files from the bundled libraries # (jemalloc, yassl, readline, pcre, etc) # before the ones installed in the system |