Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build: Add support to MariaDB 10.4 on Windows

Browse Source 
MariaDB 10.4 (latest stable) is the only supported version.
This commit is contained in:
Giacomo Pozzoni
2020-04-24 18:59:32 +02:00
committed by jackpoz
parent ee218a5642
commit 7c91c423d0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/macros/FindMySQL.cmake
View File

@@ -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."
)