luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: uniform ZLIB to use USE_ variable and clean curl-config.cmake.in

Browse Source 
Closes #3123
This commit is contained in:
Tuomo Rinne 2018-10-27 11:23:19 +01:00 committed by Daniel Stenberg
parent dd98c1f34b
commit e97679a360
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMake/curl-config.cmake.in
View File

@ -1,15 +1,12 @@
@PACKAGE_INIT@ @PACKAGE_INIT@
if("@USE_OPENSSL@" OR "@CURL_ZLIB@" ) include(CMakeFindDependencyMacro)
include(CMakeFindDependencyMacro) if(@USE_OPENSSL@)
if ("@USE_OPENSSL@") find_dependency(OpenSSL @OPENSSL_VERSION_MAJOR@)
find_dependency(OpenSSL "@OPENSSL_VERSION_MAJOR@") endif()
endif() if(@USE_ZLIB@)
if("@CURL_ZLIB@") find_dependency(ZLIB @ZLIB_VERSION_MAJOR@)
find_dependency(ZLIB "@ZLIB_VERSION_MAJOR@")
endif()
endif() endif()
include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake") include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
check_required_components("@PROJECT_NAME@") check_required_components("@PROJECT_NAME@")

4
CMakeLists.txt
View File

@ -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) option(CURL_ZLIB "Set to ON to enable building curl with zlib support." ON)
set(HAVE_LIBZ OFF) set(HAVE_LIBZ OFF)
set(HAVE_ZLIB_H OFF) set(HAVE_ZLIB_H OFF)
set(HAVE_ZLIB OFF) set(USE_ZLIB OFF)
if(CURL_ZLIB) if(CURL_ZLIB)
find_package(ZLIB QUIET) find_package(ZLIB QUIET)
if(ZLIB_FOUND) if(ZLIB_FOUND)
set(HAVE_ZLIB_H ON) set(HAVE_ZLIB_H ON)
set(HAVE_ZLIB ON)
set(HAVE_LIBZ ON) set(HAVE_LIBZ ON)
set(USE_ZLIB ON)
# Depend on ZLIB via imported targets if supported by the running # Depend on ZLIB via imported targets if supported by the running
# version of CMake. This allows our dependents to get our dependencies # version of CMake. This allows our dependents to get our dependencies