diff options
| author | Kargatum <dowlandtop@yandex.com> | 2020-08-31 03:47:48 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 22:47:48 +0200 |
| commit | 277b401df45879fa33345878be8864e3ba5aa8c3 (patch) | |
| tree | 2845ce4a5a9e90f6821b2ab475f36661266c79e5 | |
| parent | 86e6438008cf5179a2ff3b22c2e0459ee7aaa20c (diff) | |
Core/Mysql: support MariaDB 10.5 (#25359)
| -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." ) |