summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorTuomo Rinne <me@tuomo.co.uk>2018-10-27 11:23:19 +0100
committerDaniel Stenberg <daniel@haxx.se>2018-10-29 17:10:31 +0100
commite97679a360dda4ea6188b09a145f73a2a84acedd (patch)
tree622e4d3ccb98178ce5b6af8a0dea00475718fbc6 /CMakeLists.txt
parentdd98c1f34b19aff1ab3db55db36c86f5db5f2685 (diff)
downloadcurl-e97679a360dda4ea6188b09a145f73a2a84acedd.tar.gz
cmake: uniform ZLIB to use USE_ variable and clean curl-config.cmake.in
Closes #3123
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0478ae179..d7ad6caa1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -508,13 +508,13 @@ check_library_exists("${CURL_LIBS}" dlopen "" HAVE_DLOPEN)
option(CURL_ZLIB "Set to ON to enable building curl with zlib support." ON)
set(HAVE_LIBZ OFF)
set(HAVE_ZLIB_H OFF)
-set(HAVE_ZLIB OFF)
+set(USE_ZLIB OFF)
if(CURL_ZLIB)
find_package(ZLIB QUIET)
if(ZLIB_FOUND)
set(HAVE_ZLIB_H ON)
- set(HAVE_ZLIB ON)
set(HAVE_LIBZ ON)
+ set(USE_ZLIB ON)
# Depend on ZLIB via imported targets if supported by the running
# version of CMake. This allows our dependents to get our dependencies