diff options
| author | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2014-02-05 19:23:11 +0200 |
| commit | 10001c8e4f4bf08b3c491dce2714e13cca667890 (patch) | |
| tree | 738ffc405ffa9a11753f7b9a781f244dc270f803 /cmake/jemalloc.cmake | |
| parent | f68eac2eadb9bdb3d9c3554b37d6c253f04562d2 (diff) | |
| parent | 5426facdcbfba2d78dab3c709cbf278073383b7c (diff) | |
| download | mariadb-git-10001c8e4f4bf08b3c491dce2714e13cca667890.tar.gz | |
Automatic merge
Diffstat (limited to 'cmake/jemalloc.cmake')
| -rw-r--r-- | cmake/jemalloc.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake index bc6bf60781d..3df17f362bc 100644 --- a/cmake/jemalloc.cmake +++ b/cmake/jemalloc.cmake @@ -53,6 +53,7 @@ MACRO (CHECK_JEMALLOC) CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC) IF (HAVE_JEMALLOC) SET(LIBJEMALLOC jemalloc) + SET(MALLOC_LIBRARY "system jemalloc") ELSEIF (WITH_JEMALLOC STREQUAL "system") MESSAGE(FATAL_ERROR "system jemalloc is not found") ELSEIF (WITH_JEMALLOC STREQUAL "yes") @@ -61,5 +62,6 @@ MACRO (CHECK_JEMALLOC) ENDIF() IF(WITH_JEMALLOC STREQUAL "bundled" OR trybundled) USE_BUNDLED_JEMALLOC() + SET(MALLOC_LIBRARY "bundled jemalloc") ENDIF() ENDMACRO() |