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 #5934 from Icinga/feature/cmake-library-paths 

Add more include/library paths for MySQL and PostgreSQL
This commit is contained in:
Michael Friedrich 2018-01-03 10:58:30 +01:00 committed by GitHub
parent 27a2d95338 6afc4ec7ac
commit 158312c87b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,8 @@
##########################################################################
FILE(GLOB _macports_include_dirs /opt/local/include/mysql*/mysql)
#-------------- FIND MYSQL_INCLUDE_DIR ------------------
FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
$ENV{MYSQL_INCLUDE_DIR}
@ -40,9 +42,12 @@ FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
/opt/local/include/mysql5
/usr/local/mysql/include
/usr/local/mysql/include/mysql
${_macports_include_dirs}
$ENV{ProgramFiles}/MySQL/*/include
$ENV{SystemDrive}/MySQL/*/include)
UNSET(_macports_include_dirs)
#----------------- FIND MYSQL_LIB_DIR -------------------
IF (WIN32)
SET(MYSQL_CLIENT_LIBS libmysql)
@ -70,6 +75,9 @@ IF (WIN32)
$ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist})
ELSE (WIN32)
SET(MYSQL_CLIENT_LIBS mysqlclient)
FILE(GLOB _macports_lib_dirs /opt/local/lib/mysql*/mysql)
FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient
PATHS
$ENV{MYSQL_DIR}/libmysql_r/.libs
@ -82,7 +90,10 @@ ELSE (WIN32)
/opt/local/mysql5/lib
/opt/local/lib/mysql5/mysql
/opt/mysql/mysql/lib/mysql
/opt/mysql/lib/mysql)
/opt/mysql/lib/mysql
${_macports_lib_dirs})
UNSET(_macports_lib_dirs)
ENDIF (WIN32)
IF(MYSQL_LIB)

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

@ -112,6 +112,8 @@ if ( WIN32 )
foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
set(PostgreSQL_ADDITIONAL_SEARCH_PATHS ${PostgreSQL_ADDITIONAL_SEARCH_PATHS} "C:/Program Files/PostgreSQL/${suffix}" )
endforeach()
else()
set(PostgreSQL_ADDITIONAL_SEARCH_PATHS ${PostgreSQL_ADDITIONAL_SEARCH_PATHS} "/Library/PostgreSQL/*")
endif()
set( PostgreSQL_ROOT_DIRECTORIES
ENV PostgreSQL_ROOT