From 11b6b476d6a6569ee5680d83d165255f206555f9 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 7 Feb 2024 09:16:12 +0100 Subject: CMake: added MySQL 8.3 to FindMySQL cmake macro (cherry picked from commit 7199ccf156e806f967471e24677d265b525aeb11) --- cmake/macros/FindMySQL.cmake | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'cmake/macros/FindMySQL.cmake') diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 361dbde3d4f..0123f86a9dc 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -122,25 +122,30 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/include /usr/local/include/mysql /usr/local/mysql/include + "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.3" "${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.3" "${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.3;Location]" "[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.3;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.3" "$ENV{SystemDrive}/MySQL/MySQL Server 8.2" "$ENV{SystemDrive}/MySQL/MySQL Server 8.1" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0" @@ -183,25 +188,30 @@ if(WIN32) ${_MYSQL_ROOT_HINTS} PATHS ${MYSQL_ADD_LIBRARIES_PATH} + "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.3" "${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.3" "${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.3;Location]" "[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.3;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.3" "$ENV{SystemDrive}/MySQL/MySQL Server 8.2" "$ENV{SystemDrive}/MySQL/MySQL Server 8.1" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0" @@ -253,25 +263,30 @@ if(WIN32) HINTS ${_MYSQL_ROOT_HINTS} PATHS + "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.3" "${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.3" "${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.3;Location]" "[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.3;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.3" "$ENV{SystemDrive}/MySQL/MySQL Server 8.2" "$ENV{SystemDrive}/MySQL/MySQL Server 8.1" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0" -- cgit v1.2.3