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

Don't link against libmysqlclient_r 

fixes #12514
This commit is contained in:
Gunnar Beutner 2016-08-27 09:59:23 +02:00
parent b5b09216c6
commit 16742f83ba
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,22 +69,6 @@ IF (WIN32)
$ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist} $ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist}
$ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist}) $ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist})
ELSE (WIN32) ELSE (WIN32)
SET(MYSQL_CLIENT_LIBS mysqlclient_r)
FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient_r
PATHS
$ENV{MYSQL_DIR}/libmysql_r/.libs
$ENV{MYSQL_DIR}/lib
$ENV{MYSQL_DIR}/lib/mysql
/usr/lib/mysql
/usr/local/lib/mysql
/usr/local/mysql/lib
/usr/local/mysql/lib/mysql
/opt/local/mysql5/lib
/opt/local/lib/mysql5/mysql
/opt/mysql/mysql/lib/mysql
/opt/mysql/lib/mysql)
IF(NOT MYSQL_LIB)
SET(MYSQL_CLIENT_LIBS mysqlclient) SET(MYSQL_CLIENT_LIBS mysqlclient)
FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient
PATHS PATHS
@ -99,7 +83,6 @@ ELSE (WIN32)
/opt/local/lib/mysql5/mysql /opt/local/lib/mysql5/mysql
/opt/mysql/mysql/lib/mysql /opt/mysql/mysql/lib/mysql
/opt/mysql/lib/mysql) /opt/mysql/lib/mysql)
ENDIF (NOT MYSQL_LIB)
ENDIF (WIN32) ENDIF (WIN32)
IF(MYSQL_LIB) IF(MYSQL_LIB)