diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-23 11:26:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-23 11:26:33 (GMT) |
| commit | 75c99bfb219028871fc69c239e3ebc19aa344c6e (patch) | |
| tree | 20544f334d5acdb26f47f69b5c8cc6290689a856 | |
| parent | 63dfa74f5f8773d839d2e35fb6a9bbb2007a4017 (diff) | |
| parent | dd3e4767863dfe1307d4dccd2445e5312b55473e (diff) | |
| download | CMake-75c99bfb219028871fc69c239e3ebc19aa344c6e.zip CMake-75c99bfb219028871fc69c239e3ebc19aa344c6e.tar.gz CMake-75c99bfb219028871fc69c239e3ebc19aa344c6e.tar.bz2 | |
Merge topic 'ssl-warning'
dd3e476786 OpenSSL: Issue an error if OpenSSL is not found
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !3565
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 399e79c..5efa077 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -429,10 +429,7 @@ macro (CMAKE_BUILD_UTILITIES) set(_CMAKE_USE_OPENSSL_DEFAULT OFF) if(NOT DEFINED CMAKE_USE_OPENSSL AND NOT WIN32 AND NOT APPLE AND CMAKE_SYSTEM_NAME MATCHES "(Linux|FreeBSD)") - find_package(OpenSSL QUIET) - if(OPENSSL_FOUND) - set(_CMAKE_USE_OPENSSL_DEFAULT ON) - endif() + set(_CMAKE_USE_OPENSSL_DEFAULT ON) endif() option(CMAKE_USE_OPENSSL "Use OpenSSL." ${_CMAKE_USE_OPENSSL_DEFAULT}) mark_as_advanced(CMAKE_USE_OPENSSL) diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index 37522fc..bc8a7dc 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -449,7 +449,12 @@ if(CMAKE_USE_SECTRANSP) endif() if(CMAKE_USE_OPENSSL) - find_package(OpenSSL REQUIRED) + find_package(OpenSSL) + if(NOT OpenSSL_FOUND) + message(FATAL_ERROR + "Could not find OpenSSL. Install an OpenSSL development package or " + "configure CMake with -DCMAKE_USE_OPENSSL=OFF to build without OpenSSL.") + endif() set(SSL_ENABLED ON) set(USE_OPENSSL ON) set(HAVE_LIBCRYPTO ON) |