diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-10 23:02:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-10 23:02:25 +0200 |
| commit | 62643f81e6749913cdd250ec0db9529968addc50 (patch) | |
| tree | 5deb1fbf586ee4cd46e02914cd65f1d23c7ac3f5 /CMakeLists.txt | |
| parent | 0e1070125f8fb2ffeba985345b001b3ca436bd44 (diff) | |
| parent | 265bbf5fe172f1ccb68d2b9c1da93dc7ad1c6cee (diff) | |
| download | mariadb-git-62643f81e6749913cdd250ec0db9529968addc50.tar.gz | |
merge with 5.5-tokudb tree. In particular:
* add TokuDB, together with the ft-index library
* cmake support, auto-detecting whether tokudb can be built
* fix packaging - tokudb-engine.rpm, deb
* remove PBXT
* add jemalloc
* the server is built with jemalloc by default even if TokuDB is not built
* documentation files in RPM are installed in the correct location
* support for optional deb packages (tokudb has specific build requirements)
* move plugins from mariadb-server deb to appropriate debs (server/test/libmariadbclient)
* correct mariadb-test.deb to be not architecture-independent
* fix out-of-tree builds to never modify in-tree files
* new handler::prepare_index_scan() method
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fa1b649cddb..0cbbd6c0571 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,7 @@ INCLUDE(mysql_version) INCLUDE(cpack_source_ignore_files) INCLUDE(install_layout) INCLUDE(cpack_rpm) +INCLUDE(cpack_deb) # Add macros INCLUDE(character_sets) @@ -144,6 +145,7 @@ INCLUDE(ssl) INCLUDE(readline) INCLUDE(libutils) INCLUDE(dtrace) +INCLUDE(jemalloc) INCLUDE(ctest) INCLUDE(plugin) INCLUDE(install_macros) @@ -263,6 +265,8 @@ MYSQL_CHECK_SSL() # Add readline or libedit. MYSQL_CHECK_READLINE() +CHECK_JEMALLOC() + # # Setup maintainer mode options by the end. Platform checks are # not run with the warning options as to not perturb fragile checks @@ -362,15 +366,12 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql -DESTINATION ${INSTALL_DOCREADMEDIR} -COMPONENT Readme -OPTIONAL -) -INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) -INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR}) +INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER + COMPONENT Readme) +INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC + ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) IF(UNIX) - INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() INCLUDE(CPack) |