From b73aa685cdfe177d93aae7985a92af62a9f41a23 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 17 Feb 2019 17:41:20 +1100 Subject: [PATCH] #526 - add working mariadb 10.3 support on windows --- cmake/FindMySQL.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 8451b73e..42fb7833 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -82,7 +82,7 @@ find_path(MYSQL_INCLUDE_DIR /usr/local/mysql/include "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/include" "${PROGRAM_FILES_64}/MySQL/include" - "${PROGRAM_FILES_64}/MariaDB 10.3/include" + "${PROGRAM_FILES_64}/MariaDB 10.3/include/mysql" "C:/MySQL/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include" "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/include" @@ -114,6 +114,7 @@ if( WIN32 ) find_library( MYSQL_LIBRARY NAMES libmysql + libmariadb PATHS ${MYSQL_ADD_LIBRARIES_PATH} "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib"