diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-03-31 01:14:00 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-03-31 01:14:00 +0300 |
| commit | 5210c69e71ddcf39ca14194504e45baa4d325610 (patch) | |
| tree | 846e5597b87730f756d2883af273ff90dc7fdb5d /CMakeLists.txt | |
| parent | c29336f2b0c99d39979609374b8673573475696f (diff) | |
| parent | a0c79bcf0062adc2489f0b0bed98b05d4db8f476 (diff) | |
| download | mariadb-git-5210c69e71ddcf39ca14194504e45baa4d325610.tar.gz | |
Merge 10.2 into bb-10.2-mariarocks
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3685ed42381..5c4e0037588 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,7 +154,6 @@ INCLUDE(ssl) INCLUDE(readline) INCLUDE(libutils) INCLUDE(dtrace) -INCLUDE(jemalloc) INCLUDE(pcre) INCLUDE(ctest) INCLUDE(plugin) @@ -313,12 +312,15 @@ IF(NOT HAVE_CXX_NEW) ENDIF() # Find header files from the bundled libraries -# (jemalloc, yassl, readline, pcre, etc) +# (yassl, readline, pcre, etc) # before the ones installed in the system SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) # Common defines and includes ADD_DEFINITIONS(-DHAVE_CONFIG_H) +IF(_FILE_OFFSET_BITS) + ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=${_FILE_OFFSET_BITS}) +ENDIF() INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include) # Add bundled or system zlib. @@ -329,7 +331,6 @@ MYSQL_CHECK_SSL() MYSQL_CHECK_READLINE() SET(MALLOC_LIBRARY "system") -CHECK_JEMALLOC() CHECK_PCRE() @@ -453,8 +454,9 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.LESSER COPYING.thirdparty +INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) + # MDEV-6526 these files are not installed anymore #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) |