diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 13 | ||||
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 1 | ||||
| -rw-r--r-- | cmake/showoptions.cmake | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 72128450638..40fa716ed69 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -63,6 +63,19 @@ if( UNIX ) endif( MYSQL_CONFIG ) endif( UNIX ) +if( WIN32 ) + # read environment variables and change \ to / + SET(PROGRAM_FILES_32 $ENV{ProgramFiles}) + if (${PROGRAM_FILES_32}) + STRING(REPLACE "\\\\" "/" PROGRAM_FILES_32 ${PROGRAM_FILES_32}) + endif(${PROGRAM_FILES_32}) + + SET(PROGRAM_FILES_64 $ENV{ProgramW6432}) + if (${PROGRAM_FILES_64}) + STRING(REPLACE "\\\\" "/" PROGRAM_FILES_64 ${PROGRAM_FILES_64}) + endif(${PROGRAM_FILES_64}) +endif ( WIN32 ) + find_path(MYSQL_INCLUDE_DIR NAMES mysql.h 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 87a372260a0..ea202e3ace7 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 ) |