diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-04-24 18:59:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-01 20:16:37 +0100 |
| commit | 63e5092f147b88641de5ee0f3eee24814eaa7cd7 (patch) | |
| tree | 924783157e3edc77bf599835d7ed13a0340457bb /cmake | |
| parent | c11288af78f97567cea4890b6051d2f436ded6e8 (diff) | |
Build: Add support to MariaDB 10.4 on Windows
MariaDB 10.4 (latest stable) is the only supported version.
(cherry picked from commit 7c91c423d05aabc18d5c36af9ecc2a9c5f49970d)
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/macros/FindMySQL.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmake/macros/FindMySQL.cmake b/cmake/macros/FindMySQL.cmake index 1fe243f0ec1..24022a5372a 100644 --- a/cmake/macros/FindMySQL.cmake +++ b/cmake/macros/FindMySQL.cmake @@ -103,6 +103,8 @@ find_path(MYSQL_INCLUDE_DIR "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/include" "c:/msys/local/include" "$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" DOC "Specify the directory containing mysql.h." ) @@ -127,7 +129,7 @@ endif( UNIX ) if( WIN32 ) find_library( MYSQL_LIBRARY NAMES - libmysql + libmysql libmariadb PATHS ${MYSQL_ADD_LIBRARIES_PATH} "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0/lib" @@ -155,6 +157,8 @@ if( WIN32 ) "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/lib/opt" "c:/msys/local/include" "$ENV{MYSQL_ROOT}/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]/lib" DOC "Specify the location of the mysql library here." ) endif( WIN32 ) @@ -216,6 +220,8 @@ if( WIN32 ) "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/bin/opt" "c:/msys/local/include" "$ENV{MYSQL_ROOT}/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]/bin" DOC "path to your mysql binary." ) |