Enable shared linkind and binding with libmysqlclient

Author: silvakid

CMakeLists.txt

@@ -85,9 +85,10 @@ if(jdbc_stand_alone)
 endif(jdbc_stand_alone)
 
 
-# TODO: support dynamic binding
-#add_config_option(MYSQLCLIENT_STATIC_BINDING BOOL ADVANCED DEFAULT ON "enable static binding")
-set(MYSQLCLIENT_STATIC_BINDING ON CACHE INTENRAL "only static biniding supported for now" FORCE)
+
+add_config_option(MYSQLCLIENT_STATIC_LINKING BOOL ADVANCED DEFAULT ON "enable libmysqlclient static linking")
+add_config_option(MYSQLCLIENT_STATIC_BINDING BOOL ADVANCED DEFAULT ON "enable libmysqlclient static binding")
+
 
 
 if(BUILD_STATIC)
@@ -134,11 +135,15 @@ include(./install_layout.cmake)
 
 include(dependency)
 
-if(MYSQLCLIENT_STATIC_BINDING)
+if(MYSQLCLIENT_STATIC_LINKING)
   # Arrange for MySQL::client to refer to the static library
   set(MYSQL_LIB_STATIC ON)
+else()
+  # Arrange for MySQL::client to refer to the dynamic library
+  set(MYSQL_LIB_STATIC OFF)
 endif()
 
+
 find_dependency(MySQL)
 find_dependency(Boost)
 

cmake/DepFindMySQL.cmake

@@ -165,6 +165,18 @@ function(main)
     NO_DEFAULT_PATH
   )
 
+  find_library(MYSQL_DLL
+    NAMES ${CMAKE_DYNAMIC_LIBRARY_PREFIX}mysqlclient${CMAKE_DYNAMIC_LIBRARY_SUFFIX}
+    PATHS ${MYSQL_LIB_DIR}
+    NO_DEFAULT_PATH
+  )
+
+  find_library(MYSQL_DLL_DEBUG
+    NAMES ${CMAKE_DYNAMIC_LIBRARY_PREFIX}mysqlclient${CMAKE_DYNAMIC_LIBRARY_SUFFIX}
+    PATHS "${MYSQL_LIB_DIR}/debug"
+    NO_DEFAULT_PATH
+  )
+
   #message("-- static lib: ${MYSQL_LIB}")
   #message("-- debug lib: ${MYSQL_LIB_DEBUG}")
 
@@ -186,6 +198,14 @@ function(main)
       set(MYSQL_LIB "${MYSQL_LIB_DEBUG}")
     endif()
 
+    if (NOT MYSQL_DLL_DEBUG)
+      set(MYSQL_DLL_DEBUG "${MYSQL_DLL}")
+    endif()
+
+    if (NOT MYSQL_DLL)
+      set(MYSQL_DLL "${MYSQL_DLL_DEBUG}")
+    endif()
+
   endif()
 
 
@@ -201,6 +221,13 @@ function(main)
     IMPORTED_LOCATION_DEBUG "${MYSQL_LIB_DEBUG}"
   )
 
+  add_library(MySQL::client-shared SHARED IMPORTED GLOBAL)
+
+  set_target_properties(MySQL::client-shared PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${MYSQL_INCLUDE_DIR}"
+    IMPORTED_LOCATION "${MYSQL_DLL}"
+    IMPORTED_LOCATION_DEBUG "${MYSQL_DLL_DEBUG}"
+  )
 
   # Define alias MySQL::client pointing to -static or -shared library,
   # depending on MYSQL_LIB_STATIC setting.
@@ -211,6 +238,10 @@ function(main)
 
   add_library(mysql-client-if INTERFACE)
 
+  set_target_properties(mysql-client-if PROPERTIES
+      INTERFACE_INCLUDE_DIRECTORIES "${MYSQL_INCLUDE_DIR}"
+      )
+
   if(MYSQL_LIB_STATIC)
     target_link_libraries(mysql-client-if INTERFACE MySQL::client-static)
   else()
@@ -235,6 +266,10 @@ function(main)
     PROPERTY VERSION ${MYSQL_VERSION}
   )
 
+  set_property(TARGET MySQL::client-shared
+    PROPERTY VERSION ${MYSQL_VERSION}
+  )
+
   #
   # Detect shared libraries on which MySQL client lib depends (if possible).
   # Stores result in MYSQL_EXTERNAL_DEPENDENCIES.
@@ -258,6 +293,9 @@ function(main)
     set_property(TARGET MySQL::client-static
       PROPERTY INTERFACE_LINK_LIBRARIES "-L${MYSQL_DIR}/lib"
     )
+    set_property(TARGET MySQL::client-shared
+      PROPERTY INTERFACE_LINK_LIBRARIES "-L${MYSQL_DIR}/lib"
+    )
   endif()
 
   if(MYSQL_EXTERNAL_DEPENDENCIES)

driver/CMakeLists.txt

@@ -47,6 +47,17 @@ else(MYSQLCLIENT_STATIC_BINDING)
   message(STATUS "Using dynamic libmysql binding")
 endif(MYSQLCLIENT_STATIC_BINDING)
 
+IF(NOT MYSQLCLIENT_STATIC_BINDING)
+  IF(NOT WIN32)
+    CHECK_INCLUDE_FILES(dlfcn.h HAVE_DLFCN_H)
+    # We are not on windows and don't have dlfcn.h - so we need static binding
+    IF(NOT HAVE_DLFCN_H)
+      MESSAGE(FATAL_ERROR "Dynamic binding has been requested but we cannot find dlfcn.h!")
+      SET(MYSQLCLIENT_STATIC_BINDING 1)
+    ENDIF(NOT HAVE_DLFCN_H)
+  ENDIF(NOT WIN32)
+ENDIF(NOT MYSQLCLIENT_STATIC_BINDING)
+
 #-----------------
 
 if(0)
@@ -76,9 +87,9 @@ endif()
 
 #-----------------
 
-#configure_file(nativeapi/binding_config.h.cm
-#               nativeapi/binding_config.h)
-#include_directories(${CMAKE_CURRENT_BINARY_DIR}/nativeapi)
+configure_file(nativeapi/binding_config.h.cm
+               nativeapi/binding_config.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/nativeapi)
 
 SET(MYSQLCPPCONN_SOURCES
   mysql_art_resultset.cpp
@@ -177,7 +188,12 @@ ENDIF(WIN32)
 add_library(jdbc STATIC ${MYSQLCPPCONN_SOURCES})
 
 target_link_libraries(jdbc PUBLIC Boost::boost)
-target_link_libraries(jdbc PRIVATE MySQL::client)
+
+if (MYSQLCLIENT_STATIC_BINDING)
+  target_link_libraries(jdbc PRIVATE MySQL::client)
+else()
+  target_include_directories(jdbc PRIVATE ${MYSQL_INCLUDE_DIR})
+endif()
 
 if(NOT BUILD_SHARED_LIBS)
   target_compile_definitions(jdbc PRIVATE -DCPPCONN_LIB_BUILD)