[icinga-checkins] icinga.org: icinga2/support/2.5: Don't link against libmysqlclient_r

git at icinga.org git at icinga.org
Mon Aug 29 12:45:53 CEST 2016


Module: icinga2
Branch: support/2.5
Commit: 9be79f03bfb372e6500baab935ea4cfcd0eff4a6
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=9be79f03bfb372e6500baab935ea4cfcd0eff4a6

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Sat Aug 27 09:59:23 2016 +0200

Don't link against libmysqlclient_r

fixes #12514

---

 third-party/cmake/FindMySQL.cmake |   21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/third-party/cmake/FindMySQL.cmake b/third-party/cmake/FindMySQL.cmake
index e29f11a..0814211 100644
--- a/third-party/cmake/FindMySQL.cmake
+++ b/third-party/cmake/FindMySQL.cmake
@@ -69,8 +69,8 @@ IF (WIN32)
     $ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist}
     $ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist})
 ELSE (WIN32)
-  SET(MYSQL_CLIENT_LIBS mysqlclient_r)
-  FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient_r
+  SET(MYSQL_CLIENT_LIBS mysqlclient)
+  FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient
     PATHS
     $ENV{MYSQL_DIR}/libmysql_r/.libs
     $ENV{MYSQL_DIR}/lib
@@ -83,23 +83,6 @@ ELSE (WIN32)
     /opt/local/lib/mysql5/mysql
     /opt/mysql/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)
 
 IF(MYSQL_LIB)



More information about the icinga-checkins mailing list