diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-09 14:02:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-09 14:02:42 +0200 |
| commit | 5b2e3b01f07e6b82e47a18c977d77eccfcd1ca13 (patch) | |
| tree | 39ca99824ddb7bfc90512f4dc6b71ffb86731c2d /cmake/jemalloc.cmake | |
| parent | 3a528261838239837fc63730b93b847e6761e692 (diff) | |
| download | mariadb-git-5b2e3b01f07e6b82e47a18c977d77eccfcd1ca13.tar.gz | |
fixes for buildbot
* disable jemalloc on windows (cannot run ./configure)
* disable jemalloc on ancient cmake (ExternalProject does not work)
* rewrite TokuDB compiler test to check for features, not versions (to work on cmake before 2.8.11)
* fix ft-index to not add VALGRIND_INCLUDE_DIR to includes, if no valgrind was found
* correct the package name in FindValgrind.cmake (for find_package(... REQUIRED) to work)
* disable ft-index tests by default (faster compilation and they aren't used anyway)
* don't build ft-index with valgrind by default (otherwise it *requires* valgrind, it doesn't auto-detect)
* use --loose-tokudb in the .opt file
Diffstat (limited to 'cmake/jemalloc.cmake')
| -rw-r--r-- | cmake/jemalloc.cmake | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake index f39d9e17670..50aa7768317 100644 --- a/cmake/jemalloc.cmake +++ b/cmake/jemalloc.cmake @@ -1,3 +1,10 @@ +# old cmake does not have ExternalProject file +IF(CMAKE_VERSION VERSION_LESS "2.8.6") + MACRO (CHECK_JEMALLOC) + ENDMACRO() + RETURN() +ENDIF() + INCLUDE(ExternalProject) MACRO (USE_BUNDLED_JEMALLOC) @@ -27,6 +34,9 @@ SET(WITH_JEMALLOC "yes" CACHE STRING #"Which jemalloc to use (possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)") MACRO (CHECK_JEMALLOC) + IF(WIN32) + SET(WITH_JEMALLOC "no") + ENDIF() IF(WITH_JEMALLOC STREQUAL "bundled" OR WITH_JEMALLOC STREQUAL "yes") USE_BUNDLED_JEMALLOC() ENDIF() |