diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-22 12:51:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-10-22 12:51:01 (GMT) |
| commit | b9d1107790f742dd263a57855f6a5870aae934df (patch) | |
| tree | be59fe8a97b819015d9e75e44c618c8c060925fb | |
| parent | e9e8dcee6b21bafdb9593633dc845400bc060983 (diff) | |
| download | CMake-b9d1107790f742dd263a57855f6a5870aae934df.zip CMake-b9d1107790f742dd263a57855f6a5870aae934df.tar.gz CMake-b9d1107790f742dd263a57855f6a5870aae934df.tar.bz2 | |
curl: Backport to work with CMake 3.1 again
Curl 7.61.1 requires CMake 3.4 to build from source and also exposes
a dependency on OpenSSL imported targets. Revert that part of the
changes imported from curl upstream.
| -rw-r--r-- | Utilities/cmcurl/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt index b7a0c32..2c836c6 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt @@ -123,7 +123,7 @@ endif() # To check: # (From Daniel Stenberg) The cmake build selected to run gcc with -fPIC on my box while the plain configure script did not. # (From Daniel Stenberg) The gcc command line use neither -g nor any -O options. As a developer, I also treasure our configure scripts's --enable-debug option that sets a long range of "picky" compiler options. -cmake_minimum_required(VERSION 3.4 FATAL_ERROR) +cmake_minimum_required(VERSION 3.0 FATAL_ERROR) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}") include(Utilities) include(Macros) @@ -454,7 +454,8 @@ if(CMAKE_USE_OPENSSL) set(USE_OPENSSL ON) set(HAVE_LIBCRYPTO ON) set(HAVE_LIBSSL ON) - list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto) + list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES}) + include_directories(${OPENSSL_INCLUDE_DIR}) set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) check_include_file("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H) |