Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 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 authored and Ovahlord committed 2020-05-05 16:27:07 +02:00
1 parent 08fbf3974e
commit 2e9f4285d9
1 file changed
+7 -1
Download Patch File Download Diff File Expand all files Collapse all files
cmake/macros/FindMySQL.cmake
+7 -1
View File
@@ -103,6 +103,8 @@ find_path(MYSQL_INCLUDE_DIR
"$ENV{SystemDrive}/MySQL/MySQL Server 5.7/include" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/include"
"c:/msys/local/include" "c:/msys/local/include"
"$ENV{MYSQL_ROOT}/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 DOC
"Specify the directory containing mysql.h." "Specify the directory containing mysql.h."
) )
@@ -127,7 +129,7 @@ endif( UNIX )
if( WIN32 ) if( WIN32 )
find_library( MYSQL_LIBRARY find_library( MYSQL_LIBRARY
NAMES NAMES
libmysql libmysql libmariadb
PATHS PATHS
${MYSQL_ADD_LIBRARIES_PATH} ${MYSQL_ADD_LIBRARIES_PATH}
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0/lib" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0/lib"
@@ -158,6 +160,8 @@ if( WIN32 )
"$ENV{SystemDrive}/MySQL/MySQL Server 5.7/lib/opt" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/lib/opt"
"c:/msys/local/include" "c:/msys/local/include"
"$ENV{MYSQL_ROOT}/lib" "$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." DOC "Specify the location of the mysql library here."
) )
endif( WIN32 ) endif( WIN32 )
@@ -219,6 +223,8 @@ if( WIN32 )
"$ENV{SystemDrive}/MySQL/MySQL Server 5.7/bin/opt" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7/bin/opt"
"c:/msys/local/include" "c:/msys/local/include"
"$ENV{MYSQL_ROOT}/bin" "$ENV{MYSQL_ROOT}/bin"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]/bin"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);INSTALLDIR]/bin"
DOC DOC
"path to your mysql binary." "path to your mysql binary."
) )