From: Gunnar Beutner <gunnar.beutner@icinga.com>
Date: Wed, 3 Jan 2018 00:05:23 +0000 (+0100)
Subject: Add more include/library paths for MySQL and PostgreSQL
X-Git-Tag: v2.9.0~254^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Fpull%2F5934%2Fhead;p=icinga2

Add more include/library paths for MySQL and PostgreSQL
---

diff --git a/third-party/cmake/FindMySQL.cmake b/third-party/cmake/FindMySQL.cmake
index 081421122..60c23afd5 100644
--- a/third-party/cmake/FindMySQL.cmake
+++ b/third-party/cmake/FindMySQL.cmake
@@ -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)
diff --git a/third-party/cmake/FindPostgreSQL.cmake b/third-party/cmake/FindPostgreSQL.cmake
index d32246671..4d213d26a 100644
--- a/third-party/cmake/FindPostgreSQL.cmake
+++ b/third-party/cmake/FindPostgreSQL.cmake
@@ -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