From 194cb7d1d1365f31a9fccf8ec433241b3442e36a Mon Sep 17 00:00:00 2001 From: samuel40791765 Date: Fri, 22 Mar 2024 01:15:08 +0000 Subject: [PATCH] Fix OpenSSL linking when only static is available --- cmake/ssl.cmake | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index 9d76fa196169..fb83708e8271 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -482,8 +482,13 @@ FUNCTION(FIND_CUSTOM_OPENSSL) SET_TARGET_PROPERTIES(OpenSSL::SSL PROPERTIES IMPORTED_LOCATION "${OPENSSL_LIBRARY}") ELSE() - SET_TARGET_PROPERTIES(OpenSSL::SSL PROPERTIES - IMPORTED_LOCATION "${COPIED_OPENSSL_LIBRARY}") + IF(HAVE_OPENSSL_SO) + SET_TARGET_PROPERTIES(OpenSSL::SSL PROPERTIES + IMPORTED_LOCATION "${COPIED_OPENSSL_LIBRARY}") + ELSE() + SET_TARGET_PROPERTIES(OpenSSL::SSL PROPERTIES + IMPORTED_LOCATION "${OPENSSL_LIBRARY}") + ENDIF() ENDIF() ADD_LIBRARY(OpenSSL::Crypto UNKNOWN IMPORTED) @@ -494,8 +499,13 @@ FUNCTION(FIND_CUSTOM_OPENSSL) SET_TARGET_PROPERTIES(OpenSSL::Crypto PROPERTIES IMPORTED_LOCATION "${CRYPTO_LIBRARY}") ELSE() - SET_TARGET_PROPERTIES(OpenSSL::Crypto PROPERTIES - IMPORTED_LOCATION "${COPIED_CRYPTO_LIBRARY}") + IF(HAVE_CRYPTO_SO) + SET_TARGET_PROPERTIES(OpenSSL::Crypto PROPERTIES + IMPORTED_LOCATION "${COPIED_CRYPTO_LIBRARY}") + ELSE() + SET_TARGET_PROPERTIES(OpenSSL::Crypto PROPERTIES + IMPORTED_LOCATION "${CRYPTO_LIBRARY}") + ENDIF() ENDIF() # We need to ensure that all code will see this.