summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-05-15 14:14:56 (GMT)
committerBrad King <brad.king@kitware.com>2017-05-15 14:14:56 (GMT)
commit9f2a68ac9ba1b82d16f00f873d0709c6f662fd0f (patch)
tree230d31006aecf7b34c2f53e98c56ca6afe6307fb
parent6bcb198023fbf02361b110b384bcd2c168dc6e51 (diff)
parent8b410453938358b1e035fc01d55f3cd1f737b7b6 (diff)
downloadCMake-9f2a68ac9ba1b82d16f00f873d0709c6f662fd0f.zip
CMake-9f2a68ac9ba1b82d16f00f873d0709c6f662fd0f.tar.gz
CMake-9f2a68ac9ba1b82d16f00f873d0709c6f662fd0f.tar.bz2
Merge branch 'FindOpenSSL-crypto-only' into release
-rw-r--r--Modules/FindOpenSSL.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 609bc17..f7e9637 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
)