From 0c837e30e81859dcdd4cefbe4483f525d1cb91ff Mon Sep 17 00:00:00 2001 From: Jean Flach Date: Tue, 23 Feb 2016 16:07:28 +0100 Subject: [PATCH] Fix CMake not finding mysql libs on Windows fixes #11208 --- third-party/cmake/FindMySQL.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/third-party/cmake/FindMySQL.cmake b/third-party/cmake/FindMySQL.cmake index d92b6c766..d24337987 100644 --- a/third-party/cmake/FindMySQL.cmake +++ b/third-party/cmake/FindMySQL.cmake @@ -95,7 +95,12 @@ IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR) FIND_LIBRARY(MYSQL_ZLIB zlib PATHS ${MYSQL_LIB_DIR}) FIND_LIBRARY(MYSQL_YASSL yassl PATHS ${MYSQL_LIB_DIR}) FIND_LIBRARY(MYSQL_TAOCRYPT taocrypt PATHS ${MYSQL_LIB_DIR}) - SET(MYSQL_CLIENT_LIBS mysqlclient_r) + + IF (WIN32) + SET(MYSQL_CLIENT_LIBS libmysql) + ELSE (WIN32) + SET(MYSQL_CLIENT_LIBS mysqlclient_r) + ENDIF (WIN32) IF (MYSQL_ZLIB) SET(MYSQL_CLIENT_LIBS ${MYSQL_CLIENT_LIBS} zlib) ENDIF (MYSQL_ZLIB) -- 2.50.1