diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-08-30 22:04:34 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-08-30 22:59:47 +0200 |
| commit | 9c04a329f2789d9337bbbb1f6888d226f80fc666 (patch) | |
| tree | cc25addf44d7fc274651b3a24544b65780e99465 | |
| parent | ae3856b582c207007f2228f77522c204feb8183b (diff) | |
Dep/MySQL: Remove hardcoded mariadb search locations
Closes #31242
(cherry picked from commit ceb9aed4e2fe2038063d2487766d863d04846974)
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 30 | ||||
| -rw-r--r-- | dep/mysql/CMakeLists.txt | 2 |
2 files changed, 27 insertions, 5 deletions
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index c295b3eafc5..45eb63f280d 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -142,13 +142,32 @@ if(WIN32) list(APPEND _MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS ${_MYSQL_ROOT_HINTS_REGISTRY_LOCATION}) endforeach() + cmake_host_system_information( + RESULT + _MYSQL_ROOT_HINTS_SUBKEYS + QUERY + WINDOWS_REGISTRY + "HKEY_LOCAL_MACHINE\\SOFTWARE" SUBKEYS + VIEW BOTH + ) + list(FILTER _MYSQL_ROOT_HINTS_SUBKEYS INCLUDE REGEX "^MariaDB ") + list(SORT _MYSQL_ROOT_HINTS_SUBKEYS COMPARE NATURAL ORDER DESCENDING) + + 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\\${subkey}" VALUE "INSTALLDIR" + 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 @@ -156,6 +175,9 @@ if(WIN32) "${PROGRAM_FILES_64}/MySQL/MySQL Server *" "${PROGRAM_FILES_32}/MySQL/MySQL Server *" "$ENV{SystemDrive}/MySQL/MySQL Server *" + "${PROGRAM_FILES_64}/MariaDB *" + "${PROGRAM_FILES_32}/MariaDB *" + "$ENV{SystemDrive}/MariaDB *" ) list(SORT _MYSQL_ROOT_PATHS_VERSION_SUBDIRECTORIES COMPARE NATURAL ORDER DESCENDING) diff --git a/dep/mysql/CMakeLists.txt b/dep/mysql/CMakeLists.txt index dd9b7c9f1b3..3620d66afb3 100644 --- a/dep/mysql/CMakeLists.txt +++ b/dep/mysql/CMakeLists.txt @@ -9,7 +9,7 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. set(MYSQL_MIN_VERSION_MySQL 8.0.34) -set(MYSQL_MIN_VERSION_MariaDB 10.4) +set(MYSQL_MIN_VERSION_MariaDB 10.6.3) find_package(MySQL COMPONENTS lib) add_library(mysql INTERFACE) |