mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[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 8120ead9d1
commit ebecaf9000
2 changed files with 3 additions and 1 deletions
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 a912d9d20437d367b3baf1f0c1a27193fa62eb09 Subproject commit 4cd99baec66832b5cd11d37cfa78d367709c281c