Merge pull request swiftlang#2449 from compnerd/curl-config

build: prefer CONFIG over MODULE for CURL

CMakeLists.txt

@@ -26,7 +26,13 @@ option(FOUNDATION_PATH_TO_LIBDISPATCH_SOURCE "Path to libdispatch source" "")
 option(FOUNDATION_PATH_TO_LIBDISPATCH_BUILD "Path to libdispatch build" "")
 option(FOUNDATION_PATH_TO_XCTEST_BUILD "Path to XCTest build" "")
 
-find_package(CURL REQUIRED)
+find_package(CURL CONFIG)
+if(CURL_FOUND)
+  include(CMakeExpandImportedTargets)
+  cmake_expand_imported_targets(CURL_LIBRARIES LIBRARIES CURL::libcurl)
+else()
+  find_package(CURL REQUIRED)
+endif()
 find_package(ICU COMPONENTS uc i18n REQUIRED)
 find_package(LibXml2 REQUIRED)
 

CoreFoundation/CMakeLists.txt

@@ -465,7 +465,15 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
   target_include_directories(CFXMLInterface
                              PRIVATE
                                ${LIBXML2_INCLUDE_DIR})
-  find_package(CURL REQUIRED)
+  find_package(CURL CONFIG)
+  if(NOT CURL_FOUND)
+    find_package(CURL REQUIRED)
+    if(NOT TARGET CURL::libcurl)
+      add_library(CURL::libcurl UNKNOWN IMPORTED)
+      set_target_properties(CURL::libcurl PROPERTIES
+        IMPORTED_LOCATION ${CURL_LIBRARIES})
+    endif()
+  endif()
   target_include_directories(CFURLSessionInterface
                              PRIVATE
                                ${CURL_INCLUDE_DIRS})
@@ -617,7 +625,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
                           ${LIBXML2_LIBRARIES})
   target_link_libraries(CFURLSessionInterface
                         PRIVATE
-                          ${CURL_LIBRARIES})
+                          CURL::libcurl)
 endif()
 if(CMAKE_SYSTEM_NAME STREQUAL Android)
   target_link_libraries(CoreFoundation