From fb0cc79de6c9dbbf56afd66d2d7ba0596a424cf9 Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Thu, 4 Jan 2018 17:32:54 +0100 Subject: [PATCH] FindMySQL: Search for mariadbclient by default This would look for both names and use the first found. --- INSTALL.md | 2 +- third-party/cmake/FindMySQL.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 2a9826034..79e3a7aa8 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -168,7 +168,7 @@ In addition to `CMAKE_INSTALL_PREFIX` here are most of the supported Icinga-spec The following settings can be tuned for the MySQL / MariaDB IDO feature. - `ICINGA2_WITH_MYSQL`: Determines whether the MySQL IDO module is built; defaults to `ON` -- `MYSQL_CLIENT_LIBS`: Client implementation used (mysqlclient / mariadbclient); defaults searches for `mysqlclient` +- `MYSQL_CLIENT_LIBS`: Client implementation used (mysqlclient / mariadbclient); defaults searches for `mysqlclient` and `mariadbclient` - `MYSQL_INCLUDE_DIR`: Directory containing include files for the mysqlclient; default empty - checking multiple paths like `/usr/include/mysql` diff --git a/third-party/cmake/FindMySQL.cmake b/third-party/cmake/FindMySQL.cmake index 14cf78514..77465d027 100644 --- a/third-party/cmake/FindMySQL.cmake +++ b/third-party/cmake/FindMySQL.cmake @@ -75,7 +75,7 @@ IF (WIN32) $ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist}) ELSE (WIN32) IF (NOT MYSQL_CLIENT_LIBS) - SET(MYSQL_CLIENT_LIBS mysqlclient) + SET(MYSQL_CLIENT_LIBS mysqlclient mariadbclient) ENDIF (NOT MYSQL_CLIENT_LIBS) FILE(GLOB _macports_lib_dirs /opt/local/lib/mysql*/mysql) -- 2.40.0