mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-16 07:30:42 +01:00
CMake: added MySQL 8.2 to FindMySQL cmake macro
This commit is contained in:
@@ -122,21 +122,26 @@ find_path(MYSQL_INCLUDE_DIR
|
||||
/usr/local/include
|
||||
/usr/local/include/mysql
|
||||
/usr/local/mysql/include
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.2"
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1"
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0"
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7"
|
||||
"${PROGRAM_FILES_64}/MySQL"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.2"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.1"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7"
|
||||
"${PROGRAM_FILES_32}/MySQL"
|
||||
"C:/MySQL"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.2;Location]"
|
||||
"[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 5.7;Location]"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.2;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 5.7;Location]"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 8.2"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 8.1"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 8.0"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 5.7"
|
||||
@@ -178,21 +183,26 @@ if(WIN32)
|
||||
${_MYSQL_ROOT_HINTS}
|
||||
PATHS
|
||||
${MYSQL_ADD_LIBRARIES_PATH}
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.2"
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1"
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0"
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7"
|
||||
"${PROGRAM_FILES_64}/MySQL/lib"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.2"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.1"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7"
|
||||
"${PROGRAM_FILES_32}/MySQL/lib"
|
||||
"C:/MySQL/lib/debug"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.2;Location]"
|
||||
"[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 5.7;Location]"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.2;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 5.7;Location]"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 8.2"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 8.1"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 8.0"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 5.7"
|
||||
@@ -243,21 +253,26 @@ if(WIN32)
|
||||
HINTS
|
||||
${_MYSQL_ROOT_HINTS}
|
||||
PATHS
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.2"
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.1"
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 8.0"
|
||||
"${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7"
|
||||
"${PROGRAM_FILES_64}/MySQL"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.2"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.1"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 8.0"
|
||||
"${PROGRAM_FILES_32}/MySQL/MySQL Server 5.7"
|
||||
"${PROGRAM_FILES_32}/MySQL"
|
||||
"C:/MySQL/bin/debug"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 8.2;Location]"
|
||||
"[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 5.7;Location]"
|
||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 8.2;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 5.7;Location]"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 8.2"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 8.1"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 8.0"
|
||||
"$ENV{SystemDrive}/MySQL/MySQL Server 5.7"
|
||||
|
||||
Reference in New Issue
Block a user