Merge remote-tracking branch 'origin/release/9.2.0' into trunk

Author: rsomla1

packaging/compat.patch

@@ -32,8 +32,21 @@ index 8b960402..37fac11d 100644
 
  #
  # Set higher warning level for the main connector code.
+diff --git a/doc/doxygen.cfg b/doc/doxygen.cfg
+index 7bf32bcf..870d6ada 100644
+--- a/doc/doxygen.cfg
++++ b/doc/doxygen.cfg
+@@ -66,7 +66,7 @@ PROJECT_NAME           = "MySQL Connector/C++"
+ # could be handy for archiving the generated documentation or if some version
+ # control system is used.
+ 
+-PROJECT_NUMBER         = 8.0.23
++PROJECT_NUMBER         = 9.2.0
+ 
+ # Using the PROJECT_BRIEF tag one can provide an optional one line description
+ # for a project that appears at the top of each page and should give viewer a
 diff --git a/version.cmake b/version.cmake
-index 53f8f540..4d32f5ee 100644
+index 53f8f540..54bc21b2 100644
 --- a/version.cmake
 +++ b/version.cmake
 @@ -34,8 +34,8 @@ set(COPYRIGHT_YEAR "2024" CACHE INTERNAL "version info")
@@ -43,7 +56,7 @@ index 53f8f540..4d32f5ee 100644
 -set(CONCPP_VERSION_MAJOR  8 CACHE INTERNAL "version info")
 -set(CONCPP_VERSION_MINOR  4 CACHE INTERNAL "version info")
 +set(CONCPP_VERSION_MAJOR  9 CACHE INTERNAL "version info")
-+set(CONCPP_VERSION_MINOR  1 CACHE INTERNAL "version info")
++set(CONCPP_VERSION_MINOR  2 CACHE INTERNAL "version info")
  set(CONCPP_VERSION_MICRO  0 CACHE INTERNAL "version info")
  # Level is "-alpha", "-beta", empty if GA
  set(CONCPP_VERSION_LEVEL  "" CACHE INTERNAL "version info")

testapp/CMakeLists.txt

@@ -60,14 +60,42 @@ PROJECT(MySQL_CONCPP_TEST)
 # ========================================================================
 # Dependencies
 
+function(find_openssl where)
+
+  if(where STREQUAL "bundled")
+    if(mysql-concpp_DIR)
+      set(WITH_SSL "${mysql-concpp_DIR}")
+    else()
+      message(WARNING
+        "A request to use bundled OpenSSL libraries was made but"
+        " Connector/C++ install location was not explicitly given"
+        " via mysql-concpp_DIR or WITH_CONCPP setting."
+      )
+      return()
+    endif()
+  endif()
 
-if(WITH_SSL)
+  find_library(openssl
+    NAMES ssl
+    PATHS "${WITH_SSL}"
+    PATH_SUFFIXES "" "lib" "lib64"
+    NO_DEFAULT_PATH
+    NO_CACHE
+  )
+
+  if(NOT openssl)
+    message(WARNING
+      "OpenSSL libraries not found at specified location: ${WITH_SSL}"
+    )
+    return()
+  endif()
 
+  get_filename_component(WITH_SSL "${openssl}" DIRECTORY CACHE)
   message(STATUS "Using custom OpenSSL libraries at: ${WITH_SSL}")
 
   add_library(openssl INTERFACE)
   # TODO: Is this path correct also on non-Win platforms?
-  target_link_directories(openssl INTERFACE "${WITH_SSL}/lib")
+  target_link_directories(openssl INTERFACE "${WITH_SSL}")
 
   if(WIN32)
     set(ssl_libs libssl libcrypto)
@@ -78,12 +106,16 @@ if(WITH_SSL)
   target_link_libraries(openssl INTERFACE ${ssl_libs})
   add_library(mysql::openssl ALIAS openssl)
 
-endif()
+endfunction()
+
 
 if(NOT DEFINED mysql-concpp_DIR AND DEFINED WITH_CONCPP)
   set(mysql-concpp_DIR "${WITH_CONCPP}")
 endif()
 
+if(WITH_SSL)
+  find_openssl("${WITH_SSL}")
+endif()
 
 find_package(mysql-concpp REQUIRED ${REQUIRED_COMPONENTS})
 

version.cmake

@@ -28,7 +28,7 @@
 
 # Note: To be used in copyright notes of generated files
 
-set(COPYRIGHT_YEAR "2024" CACHE INTERNAL "version info")
+set(COPYRIGHT_YEAR "2025" CACHE INTERNAL "version info")
 
 #
 # Connector/C++ version