aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/compiler/clang/settings.cmake2
-rw-r--r--cmake/macros/FindMySQL.cmake125
-rw-r--r--cmake/platform/unix/settings.cmake1
-rw-r--r--cmake/showoptions.cmake7
4 files changed, 48 insertions, 87 deletions
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake
index a449551a357..261a55b285f 100644
--- a/cmake/compiler/clang/settings.cmake
+++ b/cmake/compiler/clang/settings.cmake
@@ -2,7 +2,7 @@
add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
if(WITH_WARNINGS)
- set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors")
+ set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors -Wno-mismatched-tags")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual")
message(STATUS "Clang: All warnings enabled")
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake
index 6b00510ba42..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
@@ -73,25 +86,13 @@ find_path(MYSQL_INCLUDE_DIR
/usr/local/include
/usr/local/include/mysql
/usr/local/mysql/include
- "C:/Program Files/MySQL/MySQL Server 5.6/include"
- "C:/Program Files/MySQL/MySQL Server 5.5/include"
- "C:/Program Files/MySQL/MySQL Server 5.1/include"
- "C:/Program Files/MySQL/MySQL Server 5.0/include"
- "C:/Program Files/MySQL/include"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.6/include"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.5/include"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.1/include"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.0/include"
- "C:/Program Files (x86)/MySQL/include"
+ "${PROGRAM_FILES_64}/MySQL/*/include"
+ "${PROGRAM_FILES_64}/MySQL/include"
+ "${PROGRAM_FILES_32}/MySQL/*/include"
+ "${PROGRAM_FILES_32}/MySQL/include"
"C:/MySQL/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/include"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/include"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/include"
"$ENV{ProgramFiles}/MySQL/*/include"
"$ENV{SystemDrive}/MySQL/*/include"
"c:/msys/local/include"
@@ -123,41 +124,17 @@ if( WIN32 )
libmysql
PATHS
${MYSQL_ADD_LIBRARIES_PATH}
- "C:/Program Files/MySQL/MySQL Server 5.6/lib"
- "C:/Program Files/MySQL/MySQL Server 5.6/lib/opt"
- "C:/Program Files/MySQL/MySQL Server 5.5/lib"
- "C:/Program Files/MySQL/MySQL Server 5.5/lib/opt"
- "C:/Program Files/MySQL/MySQL Server 5.1/lib"
- "C:/Program Files/MySQL/MySQL Server 5.1/lib/opt"
- "C:/Program Files/MySQL/MySQL Server 5.0/lib"
- "C:/Program Files/MySQL/MySQL Server 5.0/lib/opt"
- "C:/Program Files/MySQL/lib"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.6/lib"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.6/lib/opt"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.5/lib"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.5/lib/opt"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.1/lib"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.1/lib/opt"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.0/lib"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.0/lib/opt"
- "C:/Program Files (x86)/MySQL/lib"
+ "${PROGRAM_FILES_64}/MySQL/*/lib"
+ "${PROGRAM_FILES_64}/MySQL/*/lib/opt"
+ "${PROGRAM_FILES_64}/MySQL/lib"
+ "${PROGRAM_FILES_32}/MySQL/*/lib"
+ "${PROGRAM_FILES_32}/MySQL/*/lib/opt"
+ "${PROGRAM_FILES_32}/MySQL/lib"
"C:/MySQL/lib/debug"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/lib"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/lib/opt"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/lib"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/lib/opt"
"$ENV{ProgramFiles}/MySQL/*/lib/opt"
"$ENV{SystemDrive}/MySQL/*/lib/opt"
"c:/msys/local/include"
@@ -198,41 +175,17 @@ endif( UNIX )
if( WIN32 )
find_program(MYSQL_EXECUTABLE mysql
PATHS
- "C:/Program Files/MySQL/MySQL Server 5.6/bin"
- "C:/Program Files/MySQL/MySQL Server 5.6/bin/opt"
- "C:/Program Files/MySQL/MySQL Server 5.5/bin"
- "C:/Program Files/MySQL/MySQL Server 5.5/bin/opt"
- "C:/Program Files/MySQL/MySQL Server 5.1/bin"
- "C:/Program Files/MySQL/MySQL Server 5.1/bin/opt"
- "C:/Program Files/MySQL/MySQL Server 5.0/bin"
- "C:/Program Files/MySQL/MySQL Server 5.0/bin/opt"
- "C:/Program Files/MySQL/bin"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.6/bin"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.6/bin/opt"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.5/bin"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.5/bin/opt"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.1/bin"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.1/bin/opt"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.0/bin"
- "C:/Program Files (x86)/MySQL/MySQL Server 5.0/bin/opt"
- "C:/Program Files (x86)/MySQL/bin"
+ "${PROGRAM_FILES_64}/MySQL/*/bin"
+ "${PROGRAM_FILES_64}/MySQL/*/bin/opt"
+ "${PROGRAM_FILES_64}/MySQL/bin"
+ "${PROGRAM_FILES_32}/MySQL/*/bin"
+ "${PROGRAM_FILES_32}/MySQL/*/bin/opt"
+ "${PROGRAM_FILES_32}/MySQL/bin"
"C:/MySQL/bin/debug"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/bin/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/bin/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/bin/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/bin/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/bin/opt"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\*;Location]/bin/opt"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\*;Location]/bin/opt"
"$ENV{ProgramFiles}/MySQL/*/bin/opt"
"$ENV{SystemDrive}/MySQL/*/bin/opt"
"c:/msys/local/include"
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 )