From 652f34eab99a6055caf821c1cc03eb40a83b3207 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 7 Feb 2023 10:37:05 -0500 Subject: FindOpenSSL: Use static pkgconfig if OPENSSL_USE_STATIC_LIBS=ON Fixes: #24395 --- Modules/FindOpenSSL.cmake | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 78b1919..f876f43 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -118,9 +118,14 @@ macro(_OpenSSL_test_and_find_dependencies ssl_library crypto_library) ("${crypto_library}" MATCHES "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$"))) set(_OpenSSL_has_dependencies TRUE) unset(_OpenSSL_has_dependency_zlib) - if(_OPENSSL_LIBRARIES) + if(OPENSSL_USE_STATIC_LIBS) + set(_OpenSSL_libs "${_OPENSSL_STATIC_LIBRARIES}") + else() + set(_OpenSSL_libs "${_OPENSSL_LIBRARIES}") + endif() + if(_OpenSSL_libs) unset(_OpenSSL_has_dependency_dl) - foreach(_OPENSSL_DEP_LIB IN LISTS _OPENSSL_LIBRARIES) + foreach(_OPENSSL_DEP_LIB IN LISTS _OpenSSL_libs) if (_OPENSSL_DEP_LIB STREQUAL "ssl" OR _OPENSSL_DEP_LIB STREQUAL "crypto") # ignoring: these are the targets elseif(_OPENSSL_DEP_LIB STREQUAL CMAKE_DL_LIBS) @@ -137,6 +142,7 @@ macro(_OpenSSL_test_and_find_dependencies ssl_library crypto_library) set(_OpenSSL_has_dependency_dl TRUE) find_package(Threads) endif() + unset(_OpenSSL_libs) else() set(_OpenSSL_has_dependencies FALSE) endif() -- cgit v0.12