Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity

Core/Mysql: support MariaDB 10.5 (#25359)

Browse Source
This commit is contained in:
Kargatum authored and Ovahlord committed 2023-07-09 11:18:39 +02:00
1 parent b17585fc55
commit 43a19bba2a
1 file changed
+6
Download Patch File Download Diff File Expand all files Collapse all files
cmake/macros/FindMySQL.cmake
+6
View File
@@ -105,6 +105,8 @@ find_path(MYSQL_INCLUDE_DIR
"$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;INSTALLDIR]/include/mysql"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4 (x64);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 DOC
"Specify the directory containing mysql.h." "Specify the directory containing mysql.h."
) )
@@ -162,6 +164,8 @@ if(WIN32)
"$ENV{MYSQL_ROOT}/lib" "$ENV{MYSQL_ROOT}/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]/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.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." DOC "Specify the location of the mysql library here."
) )
endif(WIN32) endif(WIN32)
@@ -225,6 +229,8 @@ if(WIN32)
"$ENV{MYSQL_ROOT}/bin" "$ENV{MYSQL_ROOT}/bin"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.4;INSTALLDIR]/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.4 (x64);INSTALLDIR]/bin"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5;INSTALLDIR]/bin"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MariaDB 10.5 (x64);INSTALLDIR]/bin"
DOC DOC
"path to your mysql binary." "path to your mysql binary."
) )