summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-05-16 13:48:04 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-05-16 13:49:05 (GMT)
commit300979e7889b34d61803675c560fe450c7404447 (patch)
tree6a3b7519fff9464ca379462737c61caea95d4303
parent46f48467c5177d0dc6e99b03447ba8c813108f35 (diff)
parent8b410453938358b1e035fc01d55f3cd1f737b7b6 (diff)
downloadCMake-300979e7889b34d61803675c560fe450c7404447.zip
CMake-300979e7889b34d61803675c560fe450c7404447.tar.gz
CMake-300979e7889b34d61803675c560fe450c7404447.tar.bz2
Merge topic 'FindOpenSSL-crypto-only'
8b410453 FindOpenSSL: Restore support for crypto-only result Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !846
-rw-r--r--Modules/FindOpenSSL.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 1209560..f32eb50 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -376,7 +376,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
@@ -386,7 +386,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
)