Fix dependency of the classic JDBC coneector on the MySQL client library or its dependencies

Note: This change also ensures that the openSSL library bundled with
the server is used (if available) not the one that was found and used
for building the XDevAPI connector.

Author: rsomla1

jdbc/CMakeLists.txt

@@ -266,25 +266,12 @@ add_version_info(connector-jdbc
   "Implements MySQL Connector/C++ legacy JDBC API."
 )
 
+# Note: The MySQL::client target works (and is needed) both when linking
+# to the MySQL client library dynamically and statically. In the latter case
+# it brings additional linker options that are required (e.g. to resolve
+# dependencies of the client library code).
 
-
-# Note: When connector links statically to the client library, targets using
-# the connector must be able to find dependencies of the client library, such
-# as openssl libs. The MYSQL_EXTERNAL_SEARCHPATH variable set by DepFindMySQL.
-# cmake stores detected locations where client library dependencies that
-# are bundled with it can be found. We add it here as interface property
-# so that other targets that link with the connector will have library search
-# path correctly set in the compile line.
-#
-# TODO: Modify merge_libraries() logic to autmatically detect transitive link
-# directory path properties of merged targets and then set them on the merged
-# library target.
-
-if(MYSQLCLIENT_STATIC_LINKING)
-  target_link_directories(connector-jdbc INTERFACE
-    ${MYSQL_EXTERNAL_SEARCHPATH}
-  )
-endif()
+target_link_libraries(connector-jdbc PUBLIC MySQL::client)
 
 
 #

jdbc/cmake/DepFindMySQL.cmake

@@ -297,7 +297,6 @@ function(main)
 
   if(MYSQL_LIB_STATIC)
     target_link_libraries(mysql-client-if INTERFACE MySQL::client-static)
-    target_link_libraries(mysql-client-if INTERFACE OpenSSL::SSL)
   else()
     target_link_libraries(mysql-client-if INTERFACE MySQL::client-shared)
   endif()
@@ -379,7 +378,7 @@ function(main)
 
     #
     # If external dependencies were found, add them to the static target
-    # as any code that liks to static library should also link with the
+    # as any code that links to static library should also link with the
     # external dependencies.
     #
 
@@ -531,7 +530,8 @@ function(use_mysql_config)
     # option.
 
     if(NOT lib MATCHES
-        "(mysqlclient|libmysql|^stdc|^gcc|^CrunG3|^c$|^statomic|^ssl|^crypto)"
+        "(mysqlclient|libmysql|^stdc|^gcc|^CrunG3|^c$|^statomic)"
+        #|^ssl|^crypto)"
       )
 
       list(APPEND MYSQL_EXTERNAL_DEPENDENCIES ${lib})

jdbc/test/CMakeLists.txt

@@ -79,9 +79,6 @@ IF(MSBUILD)
   ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS")
 ENDIF()
 
-if(NOT MYSQLCLIENT_STATIC_LINKING)
-  list(APPEND MY_TARGET_LINK_LIBRARIES MySQL::client)
-endif()
 
 IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)
   SET(MY_GCOV_LINK_LIBRARIES gcov)