diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-18 21:54:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-18 21:54:45 +0200 |
| commit | 989dd4d9ec09450ff7b25987b14ee9fdfd21ad4e (patch) | |
| tree | 581c5521affaf7c8e7dd8b717fc1eaba73f5244a /cmake | |
| parent | 152f1cd086de3ad01817c7bdf0c61278eca4f971 (diff) | |
| parent | e41bca0066ddcda39b5a3eef17deae066cd113d9 (diff) | |
| download | mariadb-git-989dd4d9ec09450ff7b25987b14ee9fdfd21ad4e.tar.gz | |
5.5 merge
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 2 | ||||
| -rw-r--r-- | cmake/jemalloc.cmake | 25 |
2 files changed, 20 insertions, 7 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 28bfcfe6e08..7e5ce563b15 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -124,7 +124,7 @@ IF(UNIX) SET(WITH_EXTRA_CHARSETS all CACHE STRING "") IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") - SET(WITH_JEMALLOC "yes" CACHE STRING "") + SET(WITH_JEMALLOC "static" CACHE STRING "") IF(NOT IGNORE_AIO_CHECK) # Ensure aio is available on Linux (required by InnoDB) diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake index f22499cd843..876688f02f6 100644 --- a/cmake/jemalloc.cmake +++ b/cmake/jemalloc.cmake @@ -12,13 +12,26 @@ MACRO (CHECK_JEMALLOC) SET(WITH_JEMALLOC "yes") ENDIF() - IF(WITH_JEMALLOC STREQUAL "yes" OR WITH_JEMALLOC STREQUAL "auto") - CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC) + IF(WITH_JEMALLOC STREQUAL "yes" OR WITH_JEMALLOC STREQUAL "auto" OR + WITH_JEMALLOC STREQUAL "static") + + IF(WITH_JEMALLOC STREQUAL "static") + SET(libname jemalloc_pic) + SET(CMAKE_REQUIRED_LIBRARIES pthread dl m) + SET(what bundled) + ELSE() + SET(libname jemalloc) + SET(what system) + ENDIF() + + CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) + SET(CMAKE_REQUIRED_LIBRARIES) + IF (HAVE_JEMALLOC) - SET(LIBJEMALLOC jemalloc) - SET(MALLOC_LIBRARY "system jemalloc") - ELSEIF (WITH_JEMALLOC STREQUAL "yes") - MESSAGE(FATAL_ERROR "jemalloc is not found") + SET(LIBJEMALLOC ${libname}) + SET(MALLOC_LIBRARY "${what} jemalloc") + ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") + MESSAGE(FATAL_ERROR "${libname} is not found") ENDIF() ENDIF() ENDMACRO() |