Changeset 19225

Timestamp:

09/08/18 21:33:35 (7 years ago)

Author:

tbretz

Message:

Try to find automatically to which mysqlclient mysql++ links and use this library as well if not overwritten by the user. Link the SQL libraried to Configuration where they belong to.

File:

• trunk/FACT++/CMakeLists.txt (modified) (5 diffs)

trunk/FACT++/CMakeLists.txt

@@ -22 +22 @@
 ENDIF()
 
+
 #SET(CMAKE_VERBOSE_MAKEFILE ON)
 
@@ -124 +125 @@
 
 FIND_PACKAGE(Nova     REQUIRED)
-FIND_PACKAGE(MySQL    REQUIRED)
-FIND_PACKAGE(MySQL++  REQUIRED)
 FIND_PACKAGE(OpenSSL  REQUIRED)  # Required for boost::asio::ssl
 
@@ -145 +144 @@
 #MESSAGE("")
 
+# =============== MySQL ============
+
+INCLUDE(GetPrerequisites)
+
+FIND_PACKAGE(MySQL++ REQUIRED)
+
+IF(NOT DEFINED MYSQL_LIBRARY)
+        GET_PREREQUISITES(${MYSQLPP_LIBRARY} MYSQL_LIBRARY 0 0 "" "")
+        LIST(FILTER MYSQL_LIBRARY INCLUDE REGEX .*mysqlclient.*)
+        IF (DEFINED MYSQL_LIBRARY)
+                MESSAGE(STATUS "MySQL++ links to " ${MYSQL_LIBRARY})
+        ENDIF()
+ENDIF()
+
+FIND_PACKAGE(MySQL REQUIRED)
+
 INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR} ${MYSQLPP_INCLUDE_DIR})
-#LINK_DIRECTORIES(${MYSQL_LIBRARY} ${MYSQLPP_LIBRARY})
 
 
@@ -387 +401 @@
         Boost::system
         Boost::filesystem
-        Boost::program_options)
+        Boost::program_options
+        ${MYSQL_LIBRARY} ${MYSQLPP_LIBRARY})
 
 # ===================== libTime.so =======================
@@ -447 +462 @@
 # ********************************************************
 
-SET(HELP++LIBS Tools Configuration Time ${MYSQL_LIBRARY} ${MYSQLPP_LIBRARY})
+SET(HELP++LIBS Tools Configuration Time)
 
 # --------------------------------------------------------