From 28a62f97eda93d517d6baf279532c703deddd405 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 9 Jan 2020 08:56:13 -0800 Subject: [PATCH] CoreFoundation: permit CURL's CMake package for configuration Support both the CMake package provided by CURL's build as well as the fallback path when detecting CURL. This should restore the ability to use zlib for compression on Windows. --- CoreFoundation/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CoreFoundation/CMakeLists.txt b/CoreFoundation/CMakeLists.txt index ef022c1296..34b7cd757d 100644 --- a/CoreFoundation/CMakeLists.txt +++ b/CoreFoundation/CMakeLists.txt @@ -26,7 +26,10 @@ find_package(Threads) if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) find_package(LibXml2 REQUIRED) - find_package(CURL REQUIRED) + find_package(CURL CONFIG) + if(NOT CURL_FOUND) + find_package(CURL REQUIRED) + endif() find_package(ICU COMPONENTS uc i18n REQUIRED) endif()