josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dep: Support mysql 8.1 on windows

Browse Source
This commit is contained in:
Shauren
2023-08-07 19:25:33 +02:00
parent 98007f859b
commit c489e26207
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/macros/FindMySQL.cmake
+16 -1
View File
@@ -122,17 +122,22 @@ find_path(MYSQL_INCLUDE_DIR
/usr/local/include /usr/local/include
/usr/local/include/mysql /usr/local/include/mysql
/usr/local/mysql/include /usr/local/mysql/include
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7"
"${PROGRAM_FILES_64}/MySQL" "${PROGRAM_FILES_64}/MySQL"
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.1"
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0"
"${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7"
"${PROGRAM_FILES_32}/MySQL" "${PROGRAM_FILES_32}/MySQL"
"C:/MySQL" "C:/MySQL"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.1;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.1;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]"
"$ENV{SystemDrive}/MySQL/MySQL Server 8.1"
"$ENV{SystemDrive}/MySQL/MySQL Server 8.0" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0"
"$ENV{SystemDrive}/MySQL/MySQL Server 5.7" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7"
"c:/msys/local/include" "c:/msys/local/include"
@@ -173,17 +178,22 @@ if(WIN32)
${_MYSQL_ROOT_HINTS} ${_MYSQL_ROOT_HINTS}
PATHS PATHS
${MYSQL_ADD_LIBRARIES_PATH} ${MYSQL_ADD_LIBRARIES_PATH}
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7"
"${PROGRAM_FILES_64}/MySQL/lib" "${PROGRAM_FILES_64}/MySQL/lib"
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.1"
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0"
"${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7"
"${PROGRAM_FILES_32}/MySQL/lib" "${PROGRAM_FILES_32}/MySQL/lib"
"C:/MySQL/lib/debug" "C:/MySQL/lib/debug"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.1;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.1;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]"
"$ENV{SystemDrive}/MySQL/MySQL Server 8.1"
"$ENV{SystemDrive}/MySQL/MySQL Server 8.0" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0"
"$ENV{SystemDrive}/MySQL/MySQL Server 5.7" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7"
"c:/msys/local/lib" "c:/msys/local/lib"
@@ -233,17 +243,22 @@ if(WIN32)
HINTS HINTS
${_MYSQL_ROOT_HINTS} ${_MYSQL_ROOT_HINTS}
PATHS PATHS
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0"
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7"
"${PROGRAM_FILES_64}/MySQL" "${PROGRAM_FILES_64}/MySQL"
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.1"
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0" "${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0"
"${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7" "${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7"
"${PROGRAM_FILES_32}/MySQL" "${PROGRAM_FILES_32}/MySQL"
"C:/MySQL/bin/debug" "C:/MySQL/bin/debug"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.1;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.0;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.1;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.0;Location]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.7;Location]"
"$ENV{SystemDrive}/MySQL/MySQL Server 8.1"
"$ENV{SystemDrive}/MySQL/MySQL Server 8.0" "$ENV{SystemDrive}/MySQL/MySQL Server 8.0"
"$ENV{SystemDrive}/MySQL/MySQL Server 5.7" "$ENV{SystemDrive}/MySQL/MySQL Server 5.7"
"c:/msys/local/bin" "c:/msys/local/bin"