server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Added MySQL 5.7 support

Browse Source
This commit is contained in:
Antz 2016-11-24 08:16:33 +00:00 committed by Antz
parent d538aa67b7
commit 7f39938f6c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/FindMySQL.cmake
View File

@ -36,6 +36,7 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.4/include" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.4/include"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/include" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/include"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/include" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/include"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.7/include"
) )
if(WIN32 AND MSVC) if(WIN32 AND MSVC)
@ -50,6 +51,7 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.4/lib" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.4/lib"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/lib" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.5/lib"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/lib" "${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.6/lib"
"${PROGRAM_FILES_ARCH_PATH}/MySQL/MySQL Server 5.7/lib"
) )
else(WIN32 AND MSVC) else(WIN32 AND MSVC)
find_library(MYSQL_LIBRARY find_library(MYSQL_LIBRARY

2
win

@ -1 +1 @@
Subproject commit 753b6dd8df8e5ab0832f1c57ee55cd4b3d644110 Subproject commit 5b39b1859d8aac52f26f80fffbab2967e5f28b4e