diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-08 16:36:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-08 16:37:59 (GMT) |
| commit | 4ce614eb5a7575771b59578a89da1841049c9096 (patch) | |
| tree | 67510fa4216dc086a95ac8ca333a836c7cdb8134 /Modules | |
| parent | c36b18a4b608d8277557b1e7b98f587bd3924c95 (diff) | |
| parent | 652f34eab99a6055caf821c1cc03eb40a83b3207 (diff) | |
| download | CMake-4ce614eb5a7575771b59578a89da1841049c9096.zip CMake-4ce614eb5a7575771b59578a89da1841049c9096.tar.gz CMake-4ce614eb5a7575771b59578a89da1841049c9096.tar.bz2 | |
Merge topic 'findopenssl-static-findpkg-fix' into release-3.26
652f34eab9 FindOpenSSL: Use static pkgconfig if OPENSSL_USE_STATIC_LIBS=ON
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8174
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 10 |
1 files 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() |