diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index f27a13145ab..9f4bbddb539 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -122,17 +122,22 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/include /usr/local/include/mysql /usr/local/mysql/include + "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0" - "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/" + "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_64}/MySQL" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 8.1" "${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_32}/MySQL" "C:/MySQL" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.1;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.1;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]" + "$ENV{SystemDrive}/MySQL/MySQL Server 8.1" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7" "c:/msys/local/include" @@ -173,17 +178,22 @@ if(WIN32) ${_MYSQL_ROOT_HINTS} PATHS ${MYSQL_ADD_LIBRARIES_PATH} + "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_64}/MySQL/lib" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 8.1" "${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_32}/MySQL/lib" "C:/MySQL/lib/debug" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.1;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.1;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]" + "$ENV{SystemDrive}/MySQL/MySQL Server 8.1" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7" "c:/msys/local/lib" @@ -233,17 +243,22 @@ if(WIN32) HINTS ${_MYSQL_ROOT_HINTS} PATHS + "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_64}/MySQL" + "${PROGRAM_FILES_32}/MySQL/MySQL Server 8.1" "${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_32}/MySQL" "C:/MySQL/bin/debug" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.1;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.1;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]" + "$ENV{SystemDrive}/MySQL/MySQL Server 8.1" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7" "c:/msys/local/bin" |