diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-23 14:57:32 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-23 14:57:51 (GMT) |
| commit | ee98a8d24a0741fde4e702923f9c4ba533ac1825 (patch) | |
| tree | 31332029027e077336cb577c071392d89417e9fd /Modules | |
| parent | e05230ebcfebf9c47b89accbc26384b6402c11eb (diff) | |
| parent | f7e1e0545fc3050a70eb33363afa2d88432fd006 (diff) | |
| download | CMake-ee98a8d24a0741fde4e702923f9c4ba533ac1825.zip CMake-ee98a8d24a0741fde4e702923f9c4ba533ac1825.tar.gz CMake-ee98a8d24a0741fde4e702923f9c4ba533ac1825.tar.bz2 | |
Merge topic 'FindOpenSSL-deps'
f7e1e0545f FindOpenSSL: Enable static library dependencies on more platforms
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jürg Billeter <j@bitron.ch>
Merge-request: !8497
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index bf08d8a..426d00d 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -113,7 +113,7 @@ The following variables may be set to control search behavior: macro(_OpenSSL_test_and_find_dependencies ssl_library crypto_library) unset(_OpenSSL_extra_static_deps) - if((CMAKE_SYSTEM_NAME STREQUAL "Linux") AND + if(UNIX AND (("${ssl_library}" MATCHES "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$") OR ("${crypto_library}" MATCHES "\\${CMAKE_STATIC_LIBRARY_SUFFIX}$"))) set(_OpenSSL_has_dependencies TRUE) @@ -140,7 +140,7 @@ macro(_OpenSSL_test_and_find_dependencies ssl_library crypto_library) endif() endforeach() unset(_OPENSSL_DEP_LIB) - else() + elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(_OpenSSL_has_dependency_dl TRUE) endif() if(_OpenSSL_ldflags_other) @@ -152,7 +152,7 @@ macro(_OpenSSL_test_and_find_dependencies ssl_library crypto_library) endif() endforeach() unset(_OPENSSL_DEP_LDFLAG) - else() + elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(_OpenSSL_has_dependency_threads TRUE) find_package(Threads) endif() |