Unverified Commit e97679a3 authored by Tuomo Rinne's avatar Tuomo Rinne Committed by Daniel Stenberg
Browse files

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

Closes #3123
parent dd98c1f3

CMake/curl-config.cmake.in

+6 −9
Original line number Original line Diff line number Diff line 
@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("@CURL_ZLIB@")

if(@USE_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@")

CMakeLists.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -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