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

Build fix for Ubuntu Xenial 

fixes #11634
This commit is contained in:
Gunnar Beutner 2016-04-20 15:35:43 +02:00
parent b9c31ce83c
commit 6cc72e68ec
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,8 @@ FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
#----------------- FIND MYSQL_LIB_DIR ------------------- #----------------- FIND MYSQL_LIB_DIR -------------------
IF (WIN32) IF (WIN32)
SET(MYSQL_CLIENT_LIBS libmysql)
# Set lib path suffixes # Set lib path suffixes
# dist = for mysql binary distributions # dist = for mysql binary distributions
# build = for custom built tree # build = for custom built tree
@ -67,6 +69,7 @@ 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 FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient_r
PATHS PATHS
$ENV{MYSQL_DIR}/libmysql_r/.libs $ENV{MYSQL_DIR}/libmysql_r/.libs
@ -80,6 +83,23 @@ 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)
IF(NOT MYSQL_LIB)
SET(MYSQL_CLIENT_LIBS mysqlclient)
FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient
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)
ENDIF (NOT MYSQL_LIB)
ENDIF (WIN32) ENDIF (WIN32)
IF(MYSQL_LIB) IF(MYSQL_LIB)
@ -96,11 +116,6 @@ IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)
FIND_LIBRARY(MYSQL_YASSL yassl PATHS ${MYSQL_LIB_DIR}) FIND_LIBRARY(MYSQL_YASSL yassl PATHS ${MYSQL_LIB_DIR})
FIND_LIBRARY(MYSQL_TAOCRYPT taocrypt PATHS ${MYSQL_LIB_DIR}) FIND_LIBRARY(MYSQL_TAOCRYPT taocrypt PATHS ${MYSQL_LIB_DIR})
IF (WIN32)
SET(MYSQL_CLIENT_LIBS libmysql)
ELSE (WIN32)
SET(MYSQL_CLIENT_LIBS mysqlclient_r)
ENDIF (WIN32)
IF (MYSQL_ZLIB) IF (MYSQL_ZLIB)
SET(MYSQL_CLIENT_LIBS ${MYSQL_CLIENT_LIBS} zlib) SET(MYSQL_CLIENT_LIBS ${MYSQL_CLIENT_LIBS} zlib)
ENDIF (MYSQL_ZLIB) ENDIF (MYSQL_ZLIB)