WL14113: JDBC: Support LDAP/SASL/SCRAM-SHA-1 authentication

Author: silvakid

CMakeLists.txt

@@ -404,8 +404,19 @@ set_property(TARGET connector PROPERTY BUILD_WITH_INSTALL_RPATH ON)
 
 if(APPLE)
   set_property(TARGET connector APPEND PROPERTY INSTALL_RPATH "@loader_path")
+  if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
+    set_property(TARGET connector APPEND PROPERTY INSTALL_RPATH "@loader_path/../private")
+  else()
+    set_property(TARGET connector APPEND PROPERTY INSTALL_RPATH "@loader_path/private")
+  endif()
 elseif(NOT WIN32)
   set_property(TARGET connector APPEND PROPERTY INSTALL_RPATH "$ORIGIN")
+  if(CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
+    set_property(TARGET connector APPEND PROPERTY INSTALL_RPATH "$ORIGIN/../private")
+  else()
+    set_property(TARGET connector APPEND PROPERTY INSTALL_RPATH "$ORIGIN/private")
+  endif()
+
 endif()
 
 
@@ -420,7 +431,7 @@ elseif(NOT WIN32)
   set(list_rpath_cmd objdump -x $<TARGET_FILE:libconcpp> "|" grep RPATH -A2)
 endif()
 
-add_custom_command(TARGET libconcpp POST_BUILD
+add_custom_command(TARGET connector POST_BUILD
   COMMAND ${list_rpath_cmd}
   COMMENT "RPATH setting for: $<TARGET_FILE_NAME:mysqlcppconn>"
 )

cdk/cmake/DepFindSSL.cmake

@@ -312,10 +312,18 @@ function(bundle_ssl_libs)
 
     message("-- bundling OpenSSL library: ${lib}")
 
-    install(FILES ${lib}
-      DESTINATION ${INSTALL_LIB_DIR}
-      COMPONENT OpenSSLDll
-    )
+    if(WIN32 OR APPLE)
+      install(FILES ${lib}
+        DESTINATION "${INSTALL_LIB_DIR}"
+        COMPONENT OpenSSLDll
+        )
+    else()
+      install(FILES ${lib}
+        DESTINATION "${INSTALL_LIB_DIR}/private"
+        COMPONENT OpenSSLDll
+        )
+    endif()
+
 
   endforeach()
 
@@ -332,7 +340,7 @@ function(bundle_ssl_libs)
       message("-- bundling OpenSSL library: ${lib}")
 
       install(FILES ${lib}
-        DESTINATION ${INSTALL_LIB_DIR_STATIC}
+        DESTINATION "${INSTALL_LIB_DIR_STATIC}"
         COMPONENT OpenSSLDev
       )