diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-09-21 10:14:42 +0200 |
| commit | 9af177042ed0e297b8f26f2c2f8ae00b3a814a90 (patch) | |
| tree | 0d8d2fab7ebeb02f3c25c00ac1543754b625bde8 /CMakeLists.txt | |
| parent | a6add4ff43a905cee1bfd00b2ec2d276018866ce (diff) | |
| parent | 2fe0836eed16ce5809c34064893681f12c77da9f (diff) | |
| download | mariadb-git-9af177042ed0e297b8f26f2c2f8ae00b3a814a90.tar.gz | |
10.0-base merge.
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a16679337ca..b653704de3d 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) @@ -146,6 +147,7 @@ INCLUDE(ssl) INCLUDE(readline) INCLUDE(libutils) INCLUDE(dtrace) +INCLUDE(jemalloc) INCLUDE(ctest) INCLUDE(plugin) INCLUDE(install_macros) @@ -247,7 +249,9 @@ SET(PLUGINDIR "${DEFAULT_MYSQL_HOME}/${INSTALL_PLUGINDIR}") IF(INSTALL_SYSCONFDIR) SET(DEFAULT_SYSCONFDIR "${INSTALL_SYSCONFDIR}") ENDIF() - +IF(TMPDIR) + SET(DEFAULT_TMPDIR "${TMPDIR}") +ENDIF() # Run platform tests INCLUDE(configure.cmake) @@ -265,6 +269,8 @@ MYSQL_CHECK_READLINE() # Add libevent MYSQL_CHECK_LIBEVENT() +CHECK_JEMALLOC() + # # Setup maintainer mode options. Platform checks are # not run with the warning options as to not perturb fragile checks @@ -286,6 +292,7 @@ IF(WITH_UNIT_TESTS) ADD_SUBDIRECTORY(unittest/strings) ADD_SUBDIRECTORY(unittest/examples) ADD_SUBDIRECTORY(unittest/mysys) + ADD_SUBDIRECTORY(unittest/my_decimal) ADD_SUBDIRECTORY(unittest/sql) ENDIF() @@ -379,15 +386,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) |