Merge pull request #5264 from oleksandr-kachan/PS-9151-trunk

PS-9151: Fix build with WITH_SSL=openssl11 [trunk]
percona · Mar 25, 2024 · 07fe227 · 07fe227
2 parents 827eac6 + 0766d9c
commit 07fe227
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/cmake/fido2.cmake b/cmake/fido2.cmake
@@ -189,6 +189,7 @@ MACRO(MYSQL_CHECK_FIDO)
     SET(OPENSSL_IS_COMPATIBLE_WITH_BUNDLED_FIDO OFF)
     SET(WITH_AUTHENTICATION_FIDO OFF)
     SET(WITH_AUTHENTICATION_WEBAUTHN OFF)
+    SET(WITH_PERCONA_AUTHENTICATION_FIDO OFF)
   ENDIF()
 
   IF (NOT WITH_FIDO)

diff --git a/components/keyrings/keyring_kms/CMakeLists.txt b/components/keyrings/keyring_kms/CMakeLists.txt
@@ -69,7 +69,7 @@ SET(KEYRING_KMS_SOURCE
 #Component callbacks
         component_callbacks.cc)
 
-SET(KEYRING_KMS_LIBRARIES keyring_common ${CURL_LIBRARY} OpenSSL::SSL OpenSSL::Crypto)
+SET(KEYRING_KMS_LIBRARIES keyring_common ext::curl OpenSSL::SSL OpenSSL::Crypto)
 
 MYSQL_ADD_COMPONENT(keyring_kms ${KEYRING_KMS_SOURCE} LINK_LIBRARIES ${KEYRING_KMS_LIBRARIES} MODULE_ONLY)
 

diff --git a/extra/opensslpp/CMakeLists.txt b/extra/opensslpp/CMakeLists.txt
@@ -113,8 +113,6 @@ set(
 )
 list_transform_prepend(SOURCE_LIST "${SRC_DIR_EX}/")
 
-find_package(OpenSSL REQUIRED)
-
 add_library(${PROJECT_NAME} STATIC ${SOURCE_LIST} ${PUBLIC_HEADER_LIST} ${PRIVATE_HEADER_LIST})
 add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})