diff options
| author | Brad King <brad.king@kitware.com> | 2017-05-15 10:05:44 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-05-15 10:12:46 -0400 |
| commit | 8b410453938358b1e035fc01d55f3cd1f737b7b6 (patch) | |
| tree | d8cbdaf337b70fbb0b72541b7c1b6cc7cd774bd6 /Modules/FindOpenSSL.cmake | |
| parent | 8bd6af0d6386d1e0b26ff594b7d42621d67b5985 (diff) | |
| download | cmake-8b410453938358b1e035fc01d55f3cd1f737b7b6.tar.gz | |
FindOpenSSL: Restore support for crypto-only result
Since commit v3.8.0-rc1~132^2 (FindOpenSSL: Check that both CRYPTO and
SSL libraries are present, 2017-01-03) we require both crypto and ssl
libraries to be present. This makes sense because `OPENSSL_LIBRARIES`
lists both and breaks when one is not found. However, prior to that
fix we supported finding only the crypto library and using it through
the imported target. Drop the requirement for ssl to restore support
for using crypto alone.
Later this module should be taught to support the `COMPONENTS` argument
of `find_package`.
Fixes: #16882
Diffstat (limited to 'Modules/FindOpenSSL.cmake')
| -rw-r--r-- | Modules/FindOpenSSL.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake index 609bc178c4..f7e9637098 100644 --- a/Modules/FindOpenSSL.cmake +++ b/Modules/FindOpenSSL.cmake @@ -375,7 +375,7 @@ set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ) if (OPENSSL_VERSION) find_package_handle_standard_args(OpenSSL REQUIRED_VARS - OPENSSL_SSL_LIBRARY + #OPENSSL_SSL_LIBRARY # FIXME: require based on a component request? OPENSSL_CRYPTO_LIBRARY OPENSSL_INCLUDE_DIR VERSION_VAR @@ -385,7 +385,7 @@ if (OPENSSL_VERSION) ) else () find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR" - OPENSSL_SSL_LIBRARY + #OPENSSL_SSL_LIBRARY # FIXME: require based on a component request? OPENSSL_CRYPTO_LIBRARY OPENSSL_INCLUDE_DIR ) |