Merge pull request #6107 from MichalMMac/master

Allow MYSQL_LIB to be specified by ENV variable
Icinga · Feb 26, 2018 · e952302 · e952302
2 parents 3caf480 + bf909ce
commit e952302
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/third-party/cmake/FindMySQL.cmake b/third-party/cmake/FindMySQL.cmake
@@ -66,6 +66,7 @@ IF (WIN32)
 
   FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient
     PATHS
+    $ENV{MYSQL_DIR}
     $ENV{MYSQL_DIR}/lib/${libsuffixDist}
     $ENV{MYSQL_DIR}/libmysql
     $ENV{MYSQL_DIR}/libmysql/${libsuffixBuild}
@@ -82,6 +83,7 @@ ELSE (WIN32)
 
   FIND_LIBRARY(MYSQL_LIB NAMES ${MYSQL_CLIENT_LIBS}
     PATHS
+    $ENV{MYSQL_DIR}
     $ENV{MYSQL_DIR}/libmysql_r/.libs
     $ENV{MYSQL_DIR}/lib
     $ENV{MYSQL_DIR}/lib/mysql