From 3d1536855aa364261b64d149c8e70ef9819d09bb Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Tue, 7 May 2019 22:18:50 +0200 Subject: [PATCH] cmake: Update MySQL autodetection to support MariaDB --- third-party/cmake/FindMySQL.cmake | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/third-party/cmake/FindMySQL.cmake b/third-party/cmake/FindMySQL.cmake index 201a98259..d3a6e7f2a 100644 --- a/third-party/cmake/FindMySQL.cmake +++ b/third-party/cmake/FindMySQL.cmake @@ -36,15 +36,21 @@ FIND_PATH(MYSQL_INCLUDE_DIR mysql.h $ENV{MYSQL_DIR}/include /usr/include/mysql /usr/local/include/mysql + /usr/include/mariadb + /usr/local/include/mariadb /opt/mysql/mysql/include /opt/mysql/mysql/include/mysql /opt/mysql/include + /opt/mariadb/include/mysql /opt/local/include/mysql5 /usr/local/mysql/include /usr/local/mysql/include/mysql ${_macports_include_dirs} $ENV{ProgramFiles}/MySQL/*/include - $ENV{SystemDrive}/MySQL/*/include) + $ENV{SystemDrive}/MySQL/*/include + $ENV{ProgramFiles}/MariaDB*/include/mysql + $ENV{SystemDrive}/MariaDB*/include/mysql +) UNSET(_macports_include_dirs) -- 2.40.0