cmake: Ensure that required -L option is passed when linking to MySQL client lib.

Author: rsomla1

cmake/DepFindMySQL.cmake

@@ -57,8 +57,8 @@ add_config_option(WITH_MYSQL PATH
   "Base location of (monolithic) MySQL installation."
 )
 
-add_config_option(MYSQL_INCLUDE_DIR PATH "Path to MYSQL headers.")
-add_config_option(MYSQL_LIB_DIR PATH "Path to MYSQL libraries.")
+add_config_option(MYSQL_INCLUDE_DIR PATH ADVANCED "Path to MYSQL headers.")
+add_config_option(MYSQL_LIB_DIR PATH ADVANCED "Path to MYSQL libraries.")
 
 
 function(main)
@@ -235,13 +235,6 @@ function(main)
     PROPERTY VERSION ${MYSQL_VERSION}
   )
 
-  # Setting this should ensure that bundled external dependencies are used,
-  # if available.
-
-  set_property(TARGET MySQL::client-static
-    PROPERTY INTERFACE_LINK_DIRECTORIES "${MYSQL_DIR}/lib" "${MYSQL_DIR}/bin"
-  )
-
   #
   # Detect shared libraries on which MySQL client lib depends (if possible).
   # Stores result in MYSQL_EXTERNAL_DEPENDENCIES.
@@ -253,6 +246,20 @@ function(main)
   message("  include path: ${MYSQL_INCLUDE_DIR}")
   message("  library location: ${MYSQL_LIB}")
 
+  # Using INTERFACE_LINK_LIBRARIES we ensure that -L option will appear
+  # in the link line of the consumer of this library. Adding this -L option
+  # is needed to resolve dependencies, such as -lssl, to the libraries that
+  # are bundled with the server.
+  #
+  # Note: This must be done before populating INTERFACE_LINK_LIBRARIES with
+  # the dependencies themselves.
+
+  if(NOT MSVC)
+    set_property(TARGET MySQL::client-static
+      PROPERTY INTERFACE_LINK_LIBRARIES "-L${MYSQL_DIR}/lib"
+    )
+  endif()
+
   if(MYSQL_EXTERNAL_DEPENDENCIES)
     string(REPLACE ";" " " deps "${MYSQL_EXTERNAL_DEPENDENCIES}")
     message("  dependencies: ${deps}")
@@ -267,6 +274,7 @@ function(main)
 
   endif()
 
+
 endfunction(main)