diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-09 13:57:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-09 13:57:22 +0200 |
| commit | 00686e6d0e76edf3ee98139c11b1dc1ca124629d (patch) | |
| tree | 9ec21b4495401953615d8db96a228a99c4ec8835 /cmake | |
| parent | a8fc90a172d9b6521b9c96260b0f840a5687dec1 (diff) | |
| download | mariadb-git-00686e6d0e76edf3ee98139c11b1dc1ca124629d.tar.gz | |
cmake fixes for tokudb
cmake/jemalloc.cmake:
for dependencies to work, LIBJEMALLOC should be the target name, not the path
storage/tokudb/CMakeLists.txt:
* check the preconditions
* disable bdb tests (compilation errors)
* set variable, instead of SET_PROPERTY. same effect,
but doesn't fail when a plugin is disabled (that is, a target does not exist)
storage/tokudb/ft-index/CMakeLists.txt:
cmake should not look into examples/ directory,
there is hand-crafted examples/Makefile that
cmake will overwrite
storage/tokudb/ft-index/buildheader/CMakeLists.txt:
the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/cmake_modules/TokuMergeLibs.cmake:
Libraries must be specified in the specific order,
REMOVE_DUPLICATES cannot be used, because it destroys this order.
(when OSLIBS contains "-lpthread -ljemalloc -lpthread", REMOVE_DUPLICATES
makes it "-lpthread -ljemalloc". But a thread library *must* be *after* jemalloc)
storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake:
* 'which' might print errors to stderr, they are not important, shut them up
* we don't have TOKUDB_DATA, no need to warn about it
* don't configure_file into itself (with input=output)
storage/tokudb/ft-index/cmake_modules/TokuThirdParty.cmake:
jemalloc is built externally to tokudb/ft-index
storage/tokudb/ft-index/ft/CMakeLists.txt:
the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/ft/tests/CMakeLists.txt:
the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/locktree/tests/CMakeLists.txt:
the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/portability/CMakeLists.txt:
s/jemalloc/libjemalloc/
storage/tokudb/ft-index/portability/os_malloc.cc:
unnecessary include file
storage/tokudb/ft-index/portability/tests/CMakeLists.txt:
the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/src/tests/CMakeLists.txt:
the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/util/tests/CMakeLists.txt:
the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
storage/tokudb/ft-index/utils/CMakeLists.txt:
the syntax is ADD_EXECUTABLE(target source) and "source" is the file name
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/jemalloc.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/jemalloc.cmake b/cmake/jemalloc.cmake index 590ca82655b..b890e155ed6 100644 --- a/cmake/jemalloc.cmake +++ b/cmake/jemalloc.cmake @@ -3,7 +3,7 @@ INCLUDE(ExternalProject) MACRO (USE_BUNDLED_JEMALLOC) SET(SOURCE_DIR "${CMAKE_SOURCE_DIR}/extra/jemalloc") SET(BINARY_DIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/extra/jemalloc/build") - SET(LIBJEMALLOC "${BINARY_DIR}/lib/libjemalloc_pic.a") + SET(LIBJEMALLOC "libjemalloc") SET(JEMALLOC_CONFIGURE_OPTS "CC=${CMAKE_C_COMPILER}" "--with-private-namespace=jemalloc_internal_" "--enable-cc-silence") IF (CMAKE_BUILD_TYPE MATCHES "Debug" AND NOT APPLE) # see the comment in CMakeLists.txt LIST(APPEND JEMALLOC_CONFIGURE_OPTS --enable-debug) @@ -18,7 +18,7 @@ MACRO (USE_BUNDLED_JEMALLOC) INSTALL_COMMAND "" ) ADD_LIBRARY(libjemalloc STATIC IMPORTED) - SET_TARGET_PROPERTIES(libjemalloc PROPERTIES IMPORTED_LOCATION ${LIBJEMALLOC}) + SET_TARGET_PROPERTIES(libjemalloc PROPERTIES IMPORTED_LOCATION "${BINARY_DIR}/lib/libjemalloc_pic.a") ADD_DEPENDENCIES(libjemalloc jemalloc) ENDMACRO() |