aboutsummaryrefslogtreecommitdiff
path: root/cmake/macros/FindMySQL.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake/macros/FindMySQL.cmake')
-rw-r--r--cmake/macros/FindMySQL.cmake18
1 files changed, 18 insertions, 0 deletions
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake
index 7650a83c571..2c393463c47 100644
--- a/cmake/macros/FindMySQL.cmake
+++ b/cmake/macros/FindMySQL.cmake
@@ -77,6 +77,11 @@ find_path(MYSQL_INCLUDE_DIR
"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"
"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"
@@ -116,11 +121,24 @@ 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"
"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"