diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/macros/CheckPlatform.cmake | 2 | ||||
| -rw-r--r-- | cmake/platform/settings.cmake | 5 | ||||
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 1 | ||||
| -rw-r--r-- | cmake/showoptions.cmake | 7 |
4 files changed, 8 insertions, 7 deletions
diff --git a/cmake/macros/CheckPlatform.cmake b/cmake/macros/CheckPlatform.cmake index e08aaed8db2..0f41a9c127e 100644 --- a/cmake/macros/CheckPlatform.cmake +++ b/cmake/macros/CheckPlatform.cmake @@ -7,8 +7,6 @@ else() MESSAGE(STATUS "Detected 32-bit platform") endif() -include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake") - if(WIN32) include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake") elseif(UNIX) diff --git a/cmake/platform/settings.cmake b/cmake/platform/settings.cmake deleted file mode 100644 index 6df5bc2165f..00000000000 --- a/cmake/platform/settings.cmake +++ /dev/null @@ -1,5 +0,0 @@ -# set installation prefix -if( PREFIX ) - set(CMAKE_INSTALL_PREFIX "${PREFIX}") -endif() - diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 04d21863f6c..754ff450fcc 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -2,6 +2,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") if (NOT NOJEM) set(JEMALLOC_LIBRARY "jemalloc") + add_definitions(-DNO_BUFFERPOOL) message(STATUS "UNIX: Using jemalloc") endif() endif() diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index bb848a2a9c0..3136730a6b4 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -106,6 +106,13 @@ if ( NOJEM ) message(" *** jemalloc linking has been disabled!") message(" *** Please note that this is for DEBUGGING WITH VALGRIND only!") message(" *** DO NOT DISABLE IT UNLESS YOU KNOW WHAT YOU'RE DOING!") +elseif ( VALGRIND ) + message("") + message(" *** VALGRIND - WARNING!") + message(" *** jemalloc will be configured to support Valgrind") + message(" *** Please specify the valgrind include directory in VALGRIND_INCLUDE_DIR option if you get build errors") + message(" *** Please note that this is for DEBUGGING WITH VALGRIND only!") + add_definitions(-DJEMALLOC_VALGRIND) endif() if ( HELGRIND ) |