diff options
| author | Ovahlord <dreadkiller@gmx.de> | 2023-12-22 13:26:33 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-02-26 12:29:16 +0100 |
| commit | b989e1701b683ac344246db79224d92b847d7c7a (patch) | |
| tree | d0ef61aa74302bc87a96170ff66e2f0cd2cb937c /cmake/macros/FindMySQL.cmake | |
| parent | b67916cd320444a1038d7c3773ff7095e485b180 (diff) | |
CMake: added MySQL 8.2 to FindMySQL cmake macro
(cherry picked from commit b6a35c79200e0a9bccc10fd3d5ec9bf1d5af6ebe)
Diffstat (limited to 'cmake/macros/FindMySQL.cmake')
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 9f4bbddb539..361dbde3d4f 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -122,21 +122,26 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/include /usr/local/include/mysql /usr/local/mysql/include + "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.2" "${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.2" "${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.2;Location]" "[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.2;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.2" "$ENV{SystemDrive}/MySQL/MySQL Server 8.1" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7" @@ -178,21 +183,26 @@ if(WIN32) ${_MYSQL_ROOT_HINTS} PATHS ${MYSQL_ADD_LIBRARIES_PATH} + "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.2" "${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.2" "${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.2;Location]" "[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.2;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.2" "$ENV{SystemDrive}/MySQL/MySQL Server 8.1" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7" @@ -243,21 +253,26 @@ if(WIN32) HINTS ${_MYSQL_ROOT_HINTS} PATHS + "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.2" "${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.2" "${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.2;Location]" "[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.2;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.2" "$ENV{SystemDrive}/MySQL/MySQL Server 8.1" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7" |