tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6107 from MichalMMac/master 

Allow MYSQL_LIB to be specified by ENV variable
This commit is contained in:
Gunnar Beutner 2018-02-26 08:09:35 +01:00 committed by GitHub
parent 3caf480252 bf909ce47f
commit e952302e08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,7 @@ IF (WIN32)
FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient
PATHS PATHS
$ENV{MYSQL_DIR}
$ENV{MYSQL_DIR}/lib/${libsuffixDist} $ENV{MYSQL_DIR}/lib/${libsuffixDist}
$ENV{MYSQL_DIR}/libmysql $ENV{MYSQL_DIR}/libmysql
$ENV{MYSQL_DIR}/libmysql/${libsuffixBuild} $ENV{MYSQL_DIR}/libmysql/${libsuffixBuild}
@ -82,6 +83,7 @@ ELSE (WIN32)
FIND_LIBRARY(MYSQL_LIB NAMES ${MYSQL_CLIENT_LIBS} FIND_LIBRARY(MYSQL_LIB NAMES ${MYSQL_CLIENT_LIBS}
PATHS PATHS
$ENV{MYSQL_DIR}
$ENV{MYSQL_DIR}/libmysql_r/.libs $ENV{MYSQL_DIR}/libmysql_r/.libs
$ENV{MYSQL_DIR}/lib $ENV{MYSQL_DIR}/lib
$ENV{MYSQL_DIR}/lib/mysql $ENV{MYSQL_DIR}/lib/mysql