Mirrors
/
mariadb
mirror of https://github.com/MariaDB/server
3
0
Fork 0
Code Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
84644 Commits
3301 Branches
1099 Tags
1.2 GiB
Tree: f7f7f37fed
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'f7f7f37fed'
${ noResults }
mariadb/cmake/jemalloc.cmake

43 lines
1.6 KiB
Raw Normal View History

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
12 years ago
​
​
​
​
​
​
start using jemalloc
12 years ago
​
​
​
​
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
12 years ago
Fixed jemalloc with ccache build failure.
12 years ago
start using jemalloc
12 years ago
​
​
​
​
​
​
fixes for out-of-source builds mysql-test/CMakeLists.txt: don't generate collection fules. we don't use them and they break out-of-source builds
12 years ago
start using jemalloc
12 years ago
​
​
​
​
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
12 years ago
start using jemalloc
12 years ago
​
​
​
​
​
​
​
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
12 years ago
​
​
start using jemalloc
12 years ago
​
​
​
  1. # old cmake does not have ExternalProject file
  2. IF(CMAKE_VERSION VERSION_LESS "2.8.6")
  3. MACRO (CHECK_JEMALLOC)
  4. ENDMACRO()
  5. RETURN()
  6. ENDIF()
  8. INCLUDE(ExternalProject)
  10. MACRO (USE_BUNDLED_JEMALLOC)
  11. SET(SOURCE_DIR "${CMAKE_SOURCE_DIR}/extra/jemalloc")
  12. SET(BINARY_DIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/extra/jemalloc/build")
  13. SET(LIBJEMALLOC "libjemalloc")
  14. SET(JEMALLOC_CONFIGURE_OPTS "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}" "--with-private-namespace=jemalloc_internal_" "--enable-cc-silence")
  15. IF (CMAKE_BUILD_TYPE MATCHES "Debug" AND NOT APPLE) # see the comment in CMakeLists.txt
  16. LIST(APPEND JEMALLOC_CONFIGURE_OPTS --enable-debug)
  17. ENDIF()
  18. ExternalProject_Add(jemalloc
  19. PREFIX extra/jemalloc
  20. SOURCE_DIR ${SOURCE_DIR}
  21. BINARY_DIR ${BINARY_DIR}
  22. STAMP_DIR ${BINARY_DIR}
  23. CONFIGURE_COMMAND "${SOURCE_DIR}/configure" ${JEMALLOC_CONFIGURE_OPTS}
  24. BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} "build_lib_static"
  25. INSTALL_COMMAND ""
  26. )
  27. ADD_LIBRARY(libjemalloc STATIC IMPORTED)
  28. SET_TARGET_PROPERTIES(libjemalloc PROPERTIES IMPORTED_LOCATION "${BINARY_DIR}/lib/libjemalloc_pic.a")
  29. ADD_DEPENDENCIES(libjemalloc jemalloc)
  30. ENDMACRO()
  32. SET(WITH_JEMALLOC "yes" CACHE STRING
  33. "Which jemalloc to use (possible values are 'no', 'bundled', 'yes' (same as bundled)")
  34. #"Which jemalloc to use (possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
  36. MACRO (CHECK_JEMALLOC)
  37. IF(WIN32)
  38. SET(WITH_JEMALLOC "no")
  39. ENDIF()
  40. IF(WITH_JEMALLOC STREQUAL "bundled" OR WITH_JEMALLOC STREQUAL "yes")
  41. USE_BUNDLED_JEMALLOC()
  42. ENDIF()
  43. ENDMACRO()