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 /storage/tokudb/ft-index | |
| 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 'storage/tokudb/ft-index')
| -rw-r--r-- | storage/tokudb/ft-index/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | storage/tokudb/ft-index/cmake_modules/FindValgrind.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/storage/tokudb/ft-index/CMakeLists.txt b/storage/tokudb/ft-index/CMakeLists.txt index cb6a82113ca..c2b79bcb8ac 100644 --- a/storage/tokudb/ft-index/CMakeLists.txt +++ b/storage/tokudb/ft-index/CMakeLists.txt @@ -19,9 +19,11 @@ include(TokuMergeLibs) set(LIBTOKUPORTABILITY "tokuportability" CACHE STRING "Name of libtokuportability.so") set(LIBTOKUDB "tokufractaltree" CACHE STRING "Name of libtokufractaltree.so") +if(USE_VALGRIND) include_directories( ${VALGRIND_INCLUDE_DIR} ) +endif() include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/toku_include diff --git a/storage/tokudb/ft-index/cmake_modules/FindValgrind.cmake b/storage/tokudb/ft-index/cmake_modules/FindValgrind.cmake index 03335c5bbe8..73841723ce9 100644 --- a/storage/tokudb/ft-index/cmake_modules/FindValgrind.cmake +++ b/storage/tokudb/ft-index/cmake_modules/FindValgrind.cmake @@ -11,7 +11,7 @@ find_path(VALGRIND_INCLUDE_DIR valgrind/memcheck.h) find_program(VALGRIND_PROGRAM NAMES valgrind) -find_package_handle_standard_args(VALGRIND DEFAULT_MSG +find_package_handle_standard_args(Valgrind DEFAULT_MSG VALGRIND_INCLUDE_DIR VALGRIND_PROGRAM) |