link_test and testapp: Fix handling of dependencies.

On Win dependnecies should be handled by #pragma and need not to be specified in the project. Otherwise OpenSSL libs and other dependencies need to be added to the link line only when using static linking.

Author: rsomla1

jdbc

@@ -45,9 +45,6 @@ PROJECT(MySQL_CONCPP_TEST)
 #
 # WITH_JDBC               also build JDBC API test application
 #
-# WITH_BOOST              where to look for Boost (required only when building
-#                         JDBC API application)
-#
 #
 # Note: Either WITH_CONCPP or CONCPP_INCLUDE_DIR and CONCPP_LIB_DIR must be
 # set.
@@ -122,28 +119,14 @@ set(WITH_SSL $ENV{WITH_SSL} CACHE STRING
   "Set to 'builtin' if connector was built with built-in SSL support"
 )
 
-if(NOT WITH_SSL MATCHES "^(system|yes)$")
-
-  if(EXISTS ${WITH_SSL}/include/openssl/ssl.h)
-    set(OPENSSL_ROOT_DIR  "${WITH_SSL}")
-  endif()
-
-endif()
-
-find_package(OpenSSL)
-
-if(OPENSSL_FOUND)
-  MESSAGE(STATUS "OPENSSL_VERSION = ${OPENSSL_VERSION}")
-  MESSAGE(STATUS "OPENSSL_SSL_LIBRARY = ${OPENSSL_SSL_LIBRARY}")
-  MESSAGE(STATUS "OPENSSL_CRYPTO_LIBRARY = ${OPENSSL_CRYPTO_LIBRARY}")
-endif()
-
 option(WITH_JDBC "Also build the JDBC API test application" OFF)
 
 option(BUILD_STATIC "Link statically with the connector library" OFF)
 
 if(BUILD_STATIC)
   message("Linking statically")
+else()
+  message("Liniking dynamically")
 endif()
 
 option(STATIC_MSVCRT "Use static MSVC runtime library" OFF)
@@ -266,52 +249,58 @@ set_target_properties(MySQL::conncpp PROPERTIES
 
 
 #
-# We need to link with libraries on which connector depends
-# (however, no need to do it on Windows).
+# When linking statically, we need to link with libraries on which
+# connector depends (however, no need to do it on Windows).
 #
 
-if(NOT WIN32)
+if(BUILD_STATIC AND NOT WIN32)
 
-    # Connector/C++ requires these libraries on Unix.
+  set(libs)
 
-    if(NOT APPLE)
-      set_property(TARGET MySQL::conncpp
-        APPEND PROPERTY INTERFACE_LINK_LIBRARIES  pthread # rt
-      )
-    endif()
+  # Connector/C++ requires these libraries on Unix.
 
-    # On Solaris we additionally need couple more libs.
+  if(NOT APPLE)
+    list(APPEND libs pthread)
+  endif()
 
-    if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-      set_property(TARGET MySQL::conncpp
-        APPEND PROPERTY INTERFACE_LINK_LIBRARIES  socket nsl
-      )
-    endif()
+  # On Solaris we additionally need couple more libs.
 
-    #
-    # If connector uses OpenSSL libraries, we need to
-    # link to them too.
-    #
+  if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
+    list(APPEND libs socket nsl)
+  endif()
 
-    if(OPENSSL_FOUND)
-      set_property(TARGET MySQL::conncpp
-        APPEND PROPERTY INTERFACE_LINK_LIBRARIES
-        ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}
-        )
-    endif()
+  if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+    # Connector needs to Link with libresolv
+    list(APPEND libs resolv)
+  endif()
+
+  # OpenSSL dependency
+
+  if(WITH_SSL MATCHES "^(system|yes)$")
+
+    list(APPEND libs ssl crypto)
+
+  else()
 
-    if(NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-      # Connector needs to Link with libresolv
-      set_property(TARGET MySQL::conncpp
-	APPEND PROPERTY INTERFACE_LINK_LIBRARIES resolv
-      )
+    if(EXISTS ${WITH_SSL}/include/openssl/ssl.h)
+      set(OPENSSL_ROOT_DIR  "${WITH_SSL}")
     endif()
 
-else()
-  # Connector needs to Link with Dnsapi
+    find_package(OpenSSL REQUIRED)
+
+    MESSAGE(STATUS "OPENSSL_VERSION = ${OPENSSL_VERSION}")
+    MESSAGE(STATUS "OPENSSL_SSL_LIBRARY = ${OPENSSL_SSL_LIBRARY}")
+    MESSAGE(STATUS "OPENSSL_CRYPTO_LIBRARY = ${OPENSSL_CRYPTO_LIBRARY}")
+
+    list(APPEND libs ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+
+  endif()
+
   set_property(TARGET MySQL::conncpp
-    APPEND PROPERTY INTERFACE_LINK_LIBRARIES Dnsapi
+    APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+    ${libs}
   )
+
 endif()
 
 

testapp/CMakeLists.txt

@@ -101,6 +101,10 @@ set_target_properties(sub_project_test PROPERTIES FOLDER "Tests")
 # We don't want this to happen to make sure that test code can be built with
 # connector library only, as we distribute it.
 #
+# Note: For this test to work on platforms which do not provide required
+# dependencies (such as OpenSSL), connector build tree must be configured
+# with BUNDLE_DEPENDENCIES option enabled
+#
 # Note: internal installation into <binary_dir>/install is done by directly
 # executing cmake_install.cmake script which is generated by cmake.
 #
@@ -113,16 +117,18 @@ file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/link_test)
 unset(jdbc_options)
 if(WITH_JDBC)
   #message("-- BOOST_ROOT: ${BOOST_ROOT}")
-  list(APPEND jdbc_options -DWITH_JDBC=ON -DWITH_BOOST=${BOOST_ROOT})
+  list(APPEND jdbc_options -DWITH_JDBC=ON)
 endif()
 
 add_custom_target(link_test
+  COMMAND ${CMAKE_COMMAND} -E echo "==== Installing con/C++ ===="
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_BINARY_DIR}/install
   COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/install
   COMMAND ${CMAKE_COMMAND}
     -D CMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/install
     -D CMAKE_INSTALL_CONFIG_NAME=$<$<BOOL:$<CONFIGURATION>>:$<CONFIGURATION>>$<$<NOT:$<BOOL:$<CONFIGURATION>>>:Release>
     -P ${PROJECT_BINARY_DIR}/cmake_install.cmake
+  COMMAND ${CMAKE_COMMAND} -E echo "==== Configuring test application build ===="
   COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJECT_BINARY_DIR}/link_test/CMakeCache.txt
   COMMAND ${CMAKE_COMMAND}
     -G "${CMAKE_GENERATOR}"
@@ -132,20 +138,17 @@ add_custom_target(link_test
     -D STATIC_MSVCRT=${STATIC_MSVCRT}
     ${jdbc_options}
     ${PROJECT_SOURCE_DIR}/testapp
+  COMMAND ${CMAKE_COMMAND} -E echo "==== Building test application ===="
   COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIGURATION>  --clean-first
   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/link_test
-  VERBATIM
 )
 
 set_target_properties(link_test PROPERTIES FOLDER "Tests")
 
 add_dependencies(link_test connector)
-#if(TARGET connector-merge)
-#  add_dependencies(link_test connector-merge)
-#endif()
-#if(WITH_JDBC)
-#  add_dependencies(link_test build_jdbc)
-#endif()
+if(WITH_JDBC)
+  add_dependencies(link_test connector-jdbc)
+endif()
 
 # TDOD: Use ${CMAKE_COMMAND}, but evaluated at test time, not here.