From aae2dabf347750a9068cc5f73605699cfdad689c Mon Sep 17 00:00:00 2001 From: NotAdam Date: Sun, 17 Feb 2019 13:27:32 +1100 Subject: [PATCH] add mariadb 10.3 support to findmysql - fixes #526 --- cmake/FindMySQL.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index d60044c3..8451b73e 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -82,6 +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" "C:/MySQL/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/include" "$ENV{ProgramFiles}/MySQL/MySQL Server 5.7/include" @@ -118,6 +119,7 @@ if( WIN32 ) "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/lib/opt" "${PROGRAM_FILES_64}/MySQL/lib" + "${PROGRAM_FILES_64}/MariaDB 10.3/lib" "C:/MySQL/lib/debug" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/lib/opt" @@ -170,6 +172,7 @@ if( WIN32 ) "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin" "${PROGRAM_FILES_64}/MySQL/MySQL Server 5.7/bin/opt" "${PROGRAM_FILES_64}/MySQL/bin" + "${PROGRAM_FILES_64}/MariaDB 10.3/bin" "C:/MySQL/bin/debug" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.7;Location]/bin/opt"