From a26ed0aaf07a6626960eb32874c652806748fdf0 Mon Sep 17 00:00:00 2001 From: TheGhost Date: Sat, 31 Oct 2026 17:40:27 +1300 Subject: [PATCH] Update FindMySQL.cmake Fix --- cmake/macros/FindMySQL.cmake | 156 ++++++++++++----------------------- 1 file changed, 54 insertions(+), 102 deletions(-) diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 122e88be6a..1f3f8d406c 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -106,10 +106,61 @@ if(UNIX) endif(MYSQL_CONFIG) endif(UNIX) +set(_MYSQL_ROOT_PATHS) + if(WIN32) # read environment variables and change \ to / file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" PROGRAM_FILES_32) file(TO_CMAKE_PATH "$ENV{ProgramW6432}" PROGRAM_FILES_64) + + cmake_host_system_information( + RESULT + _MYSQL_ROOT_HINTS_SUBKEYS + QUERY + WINDOWS_REGISTRY + "HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB" SUBKEYS + VIEW BOTH + ) + list(SORT _MYSQL_ROOT_HINTS_SUBKEYS COMPARE NATURAL ORDER DESCENDING) + + set(_MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS) + foreach(subkey IN LISTS _MYSQL_ROOT_HINTS_SUBKEYS) + cmake_host_system_information( + RESULT + _MYSQL_ROOT_HINTS_REGISTRY_LOCATION + QUERY + WINDOWS_REGISTRY + "HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\${subkey}" VALUE "Location" + VIEW BOTH + ) + list(APPEND _MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS ${_MYSQL_ROOT_HINTS_REGISTRY_LOCATION}) + endforeach() + + set(_MYSQL_ROOT_HINTS + ${_MYSQL_ROOT_HINTS} + ${_MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS} + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5;INSTALLDIR]" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5 (x64);INSTALLDIR]" + ) + + file(GLOB _MYSQL_ROOT_PATHS_VERSION_SUBDIRECTORIES + LIST_DIRECTORIES TRUE + "${PROGRAM_FILES_64}/MySQL/MySQL Server *" + "${PROGRAM_FILES_32}/MySQL/MySQL Server *" + "$ENV{SystemDrive}/MySQL/MySQL Server *" + ) + + list(SORT _MYSQL_ROOT_PATHS_VERSION_SUBDIRECTORIES COMPARE NATURAL ORDER DESCENDING) + + set(_MYSQL_ROOT_PATHS + ${_MYSQL_ROOT_PATHS} + ${_MYSQL_ROOT_PATHS_VERSION_SUBDIRECTORIES} + "${PROGRAM_FILES_64}/MySQL" + "${PROGRAM_FILES_32}/MySQL" + "$ENV{SystemDrive}/MySQL" + ) endif(WIN32) find_path(MYSQL_INCLUDE_DIR @@ -124,40 +175,7 @@ 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" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.7" - "c:/msys/local/include" - "$ENV{MYSQL_ROOT}" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5;INSTALLDIR]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5 (x64);INSTALLDIR]" + ${_MYSQL_ROOT_PATHS} PATH_SUFFIXES include include/mysql @@ -190,40 +208,7 @@ 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" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.7" - "c:/msys/local/lib" - "$ENV{MYSQL_ROOT}" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5;INSTALLDIR]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5 (x64);INSTALLDIR]" + ${_MYSQL_ROOT_PATHS} PATH_SUFFIXES lib lib/opt @@ -265,40 +250,7 @@ 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" - "$ENV{SystemDrive}/MySQL/MySQL Server 5.7" - "c:/msys/local/bin" - "$ENV{MYSQL_ROOT}" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5;INSTALLDIR]" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5 (x64);INSTALLDIR]" + ${_MYSQL_ROOT_PATHS} PATH_SUFFIXES bin bin/opt