diff options
| author | Kargatum <dowlandtop@yandex.com> | 2020-08-31 03:47:48 +0700 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-04 21:34:01 +0100 |
| commit | c3bd803da3e2d90bba746238fa78e79b40a97a34 (patch) | |
| tree | a530dff445bd80b5dd11628d99512cc6a0384270 /cmake/macros/FindMySQL.cmake | |
| parent | 627ff1587d5836534e46dff8afd6fa9016356fb1 (diff) | |
Core/Mysql: support MariaDB 10.5 (#25359)
(cherry picked from commit 277b401df45879fa33345878be8864e3ba5aa8c3)
Diffstat (limited to 'cmake/macros/FindMySQL.cmake')
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 608644d2c6c..0ac6e6a0095 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -105,6 +105,8 @@ find_path(MYSQL_INCLUDE_DIR "$ENV{MYSQL_ROOT}/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]/include/mysql" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]/include/mysql" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5;INSTALLDIR]/include/mysql" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5 (x64);INSTALLDIR]/include/mysql" DOC "Specify the directory containing mysql.h." ) @@ -159,6 +161,8 @@ if(WIN32) "$ENV{MYSQL_ROOT}/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5;INSTALLDIR]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5 (x64);INSTALLDIR]/lib" DOC "Specify the location of the mysql library here." ) endif(WIN32) @@ -222,6 +226,8 @@ if(WIN32) "$ENV{MYSQL_ROOT}/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5;INSTALLDIR]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5 (x64);INSTALLDIR]/bin" DOC "path to your mysql binary." ) |