tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 13:45:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

FindMySQL: Search for mariadbclient by default

Browse Source 
This would look for both names and use the first found.
This commit is contained in:
Markus Frosch 2018-01-04 17:32:54 +01:00
parent f4c5c8d78a
commit fb0cc79de6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL.md
View File

@ -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. 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` - `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 - - `MYSQL_INCLUDE_DIR`: Directory containing include files for the mysqlclient; default empty -
checking multiple paths like `/usr/include/mysql` checking multiple paths like `/usr/include/mysql`

2
third-party/cmake/FindMySQL.cmake vendored
View File

@ -75,7 +75,7 @@ IF (WIN32)
$ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist}) $ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist})
ELSE (WIN32) ELSE (WIN32)
IF (NOT MYSQL_CLIENT_LIBS) IF (NOT MYSQL_CLIENT_LIBS)
SET(MYSQL_CLIENT_LIBS mysqlclient) SET(MYSQL_CLIENT_LIBS mysqlclient mariadbclient)
ENDIF (NOT MYSQL_CLIENT_LIBS) ENDIF (NOT MYSQL_CLIENT_LIBS)
FILE(GLOB _macports_lib_dirs /opt/local/lib/mysql*/mysql) FILE(GLOB _macports_lib_dirs /opt/local/lib/mysql*/mysql)