diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-07-27 01:10:26 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-07-27 01:13:38 +0100 |
| commit | bc4baa4e05ced4b9c8fe1285c2b1c5292978aa4c (patch) | |
| tree | ec37260cdac352a15896585c3c712bd8db64abcb /cmake/macros/FindMySQL.cmake | |
| parent | 92b5b2e09a13b36b8780fead2c11ca691f494e5a (diff) | |
Build/CMake: Partially revert recent changes to FindMySQL.cmake
Looking for folders like ".../MySQL/*/include" matches the MySQL Connector C libs which caused some problems.
Related #15072, #15068
P.S ".../MySQL/MySQL Server*/include" doesn't work
(cherry picked from commit e2fb3bbd466641c794438933e636d63ebf19432e)
Diffstat (limited to 'cmake/macros/FindMySQL.cmake')
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 130 |
1 files changed, 104 insertions, 26 deletions
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 40fa716ed69..02d17ab48f2 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -86,15 +86,33 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/include /usr/local/include/mysql /usr/local/mysql/include - "${PROGRAM_FILES_64}/MySQL/*/include" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/include" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/include" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/include" "${PROGRAM_FILES_64}/MySQL/include" - "${PROGRAM_FILES_32}/MySQL/*/include" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/include" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/include" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/include" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/include" "${PROGRAM_FILES_32}/MySQL/include" "C:/MySQL/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" + "[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\\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" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/include" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.6/include" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.5/include" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.1/include" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/include" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.6/include" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.5/include" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.1/include" "c:/msys/local/include" "$ENV{MYSQL_ROOT}/include" DOC @@ -124,19 +142,49 @@ if( WIN32 ) libmysql PATHS ${MYSQL_ADD_LIBRARIES_PATH} - "${PROGRAM_FILES_64}/MySQL/*/lib" - "${PROGRAM_FILES_64}/MySQL/*/lib/opt" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/lib/opt" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/lib/opt" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/lib/opt" "${PROGRAM_FILES_64}/MySQL/lib" - "${PROGRAM_FILES_32}/MySQL/*/lib" - "${PROGRAM_FILES_32}/MySQL/*/lib/opt" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/lib" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/lib" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/lib" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/lib" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/lib/opt" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/lib/opt" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/lib/opt" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/lib/opt" "${PROGRAM_FILES_32}/MySQL/lib" "C:/MySQL/lib/debug" - "[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" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;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/opt" + "[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/opt" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;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/opt" + "[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/opt" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/lib/opt" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.6/lib/opt" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.5/lib/opt" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.1/lib/opt" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/lib/opt" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.6/lib/opt" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.5/lib/opt" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.1/lib/opt" "c:/msys/local/include" "$ENV{MYSQL_ROOT}/lib" DOC "Specify the location of the mysql library here." @@ -175,19 +223,49 @@ endif( UNIX ) if( WIN32 ) find_program(MYSQL_EXECUTABLE mysql PATHS - "${PROGRAM_FILES_64}/MySQL/*/bin" - "${PROGRAM_FILES_64}/MySQL/*/bin/opt" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.6/bin/opt" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.5/bin/opt" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.1/bin/opt" "${PROGRAM_FILES_64}/MySQL/bin" - "${PROGRAM_FILES_32}/MySQL/*/bin" - "${PROGRAM_FILES_32}/MySQL/*/bin/opt" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/bin" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/bin" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/bin" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/bin" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7/bin/opt" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.6/bin/opt" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.5/bin/opt" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.1/bin/opt" "${PROGRAM_FILES_32}/MySQL/bin" "C:/MySQL/bin/debug" - "[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" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.6;Location]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.5;Location]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt" + "[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/opt" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.6;Location]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.5;Location]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt" + "[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/opt" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/bin/opt" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/bin/opt" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.6/bin/opt" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.5/bin/opt" + "$ENV{ProgramFiles}/MySQL/MySQL Server 5.1/bin/opt" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/bin/opt" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.6/bin/opt" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.5/bin/opt" + "$ENV{SystemDrive}/MySQL/MySQL Server 5.1/bin/opt" "c:/msys/local/include" "$ENV{MYSQL_ROOT}/bin" DOC |