aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/compiler/clang/settings.cmake1
-rw-r--r--cmake/macros/CheckPlatform.cmake2
-rw-r--r--cmake/macros/FindMySQL.cmake112
-rw-r--r--cmake/platform/settings.cmake5
4 files changed, 27 insertions, 93 deletions
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake
index 98f893987ec..a449551a357 100644
--- a/cmake/compiler/clang/settings.cmake
+++ b/cmake/compiler/clang/settings.cmake
@@ -17,3 +17,4 @@ endif()
# -Wno-narrowing needed to suppress a warning in g3d
# -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1")
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/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake
index 6b00510ba42..72128450638 100644
--- a/cmake/macros/FindMySQL.cmake
+++ b/cmake/macros/FindMySQL.cmake
@@ -73,25 +73,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 +111,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 +162,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/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()
-