diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 15:31:24 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-23 15:31:24 +0100 |
| commit | db39910f080534159ce8c7d55fa458365de7c3f3 (patch) | |
| tree | a0c872edccc12d60bad587b65d5e8eaf374e5060 /CMakeLists.txt | |
| parent | 925942e7af49eebc5ffeff705bb2167eb86a9dcb (diff) | |
| download | mariadb-git-db39910f080534159ce8c7d55fa458365de7c3f3.tar.gz | |
disable safemalloc for valgrind builds.
always try to use valgrind headers in debug builds.
define HAVE_valgrind for --with-valgrind
fix valgrind check in my_valgrind.h
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 27c43f1328a..4e210a8d87e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,7 @@ ENDIF() IF(WITH_SAFEMALLOC MATCHES "ON") ADD_DEFINITIONS( -DSAFEMALLOC ${DUSE_MYSYS_NEW}) -ELSEIF(WITH_SAFEMALLOC MATCHES "AUTO" AND NOT WIN32) +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}") ENDIF() |