From 7f39938f6ca6c0ee6575d5833640ea032428ffdf Mon Sep 17 00:00:00 2001 From: Antz Date: Thu, 24 Nov 2016 08:16:33 +0000 Subject: [PATCH] [Build] Added MySQL 5.7 support --- cmake/FindMySQL.cmake | 2 ++ win | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 00f602a6..d489b3cb 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -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.5/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) @@ -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.5/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) find_library(MYSQL_LIBRARY diff --git a/win b/win index 753b6dd8..5b39b185 160000 --- a/win +++ b/win @@ -1 +1 @@ -Subproject commit 753b6dd8df8e5ab0832f1c57ee55cd4b3d644110 +Subproject commit 5b39b1859d8aac52f26f80fffbab2967e5f28b4e