From: Markus Frosch Date: Tue, 7 May 2019 20:18:50 +0000 (+0200) Subject: cmake: Update MySQL autodetection to support MariaDB X-Git-Tag: v2.11.0-rc1~112^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d1536855aa364261b64d149c8e70ef9819d09bb;p=icinga2 cmake: Update MySQL autodetection to support MariaDB --- 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)