From e97679a360dda4ea6188b09a145f73a2a84acedd Mon Sep 17 00:00:00 2001 From: Tuomo Rinne Date: Sat, 27 Oct 2018 11:23:19 +0100 Subject: cmake: uniform ZLIB to use USE_ variable and clean curl-config.cmake.in Closes #3123 --- CMake/curl-config.cmake.in | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'CMake') diff --git a/CMake/curl-config.cmake.in b/CMake/curl-config.cmake.in index 5f296343e..1294e173a 100644 --- a/CMake/curl-config.cmake.in +++ b/CMake/curl-config.cmake.in @@ -1,15 +1,12 @@ @PACKAGE_INIT@ -if("@USE_OPENSSL@" OR "@CURL_ZLIB@" ) - include(CMakeFindDependencyMacro) - if ("@USE_OPENSSL@") - find_dependency(OpenSSL "@OPENSSL_VERSION_MAJOR@") - endif() - if("@CURL_ZLIB@") - find_dependency(ZLIB "@ZLIB_VERSION_MAJOR@") - endif() +include(CMakeFindDependencyMacro) +if(@USE_OPENSSL@) + find_dependency(OpenSSL @OPENSSL_VERSION_MAJOR@) +endif() +if(@USE_ZLIB@) + find_dependency(ZLIB @ZLIB_VERSION_MAJOR@) endif() - include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") check_required_components("@PROJECT_NAME@") -- cgit v1.2.3