diff options
| author | Blumfield <Blumfield@users.noreply.github.com> | 2016-10-29 18:17:58 +0200 |
|---|---|---|
| committer | Shin <borzifrancesco@gmail.com> | 2016-10-29 18:17:58 +0200 |
| commit | 43ed51caddbba65aaa57172ee0cc0341ccd17bcd (patch) | |
| tree | 6bb99aa601102f4da23b82cceae3fef074eb0373 /modules | |
| parent | 8667c3b607e5572e202ac12c62805c5e738436e8 (diff) | |
CMake: Added support for MySQL Server 5.7 (#187)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake b/modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake index 036b8302c7..4f432ca4c8 100644 --- a/modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake +++ b/modules/worldengine/nucleus/src/cmake/macros/FindMySQL.cmake @@ -72,16 +72,19 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/include /usr/local/include/mysql /usr/local/mysql/include + "C:/Program Files/MySQL/MySQL Server 5.7/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:/MySQL/include" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/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.7;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" @@ -116,12 +119,15 @@ if( WIN32 ) libmysql PATHS ${MYSQL_ADD_LIBRARIES_PATH} + "C:/Program Files/MySQL/MySQL Server 5.7/lib/opt" "C:/Program Files/MySQL/MySQL Server 5.6/lib/opt" "C:/Program Files/MySQL/MySQL Server 5.5/lib/opt" "C:/Program Files/MySQL/MySQL Server 5.1/lib/opt" "C:/Program Files/MySQL/MySQL Server 5.0/lib/opt" "C:/Program Files/MySQL/lib" "C:/MySQL/lib/debug" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt" "[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" @@ -130,6 +136,8 @@ if( WIN32 ) "[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.7;Location]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;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" |