From ebecaf90000ef5cea0aee0abbfc8ca753a0af12f 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 00f602a63..d489b3cba 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 a912d9d20..4cd99baec 160000 --- a/win +++ b/win @@ -1 +1 @@ -Subproject commit a912d9d20437d367b3baf1f0c1a27193fa62eb09 +Subproject commit 4cd99baec66832b5cd11d37cfa78d367709c281c