[vcpkg baseline][poppler] Fix issue with using libcurl. (#15491)

* [poppler] Fix issue with using libcurl. * [curl] Ensure CMake policy is set for the libcurl config file. Otherwise, ports using old (eg pre-2.8) CMake minimums might fail when they import the package. * [poppler] Add curl feature to test curl vcpkg-cmake-wrapper.
microsoft · Jan 8, 2021 · 1a4c54f · 1a4c54f
1 parent 36cd510
commit 1a4c54f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL
@@ -1,5 +1,5 @@
 Source: curl
-Port-Version: 1
+Port-Version: 2
 Version: 7.74.0
 Build-Depends: zlib
 Homepage: https://github.com/curl/curl

diff --git a/ports/curl/vcpkg-cmake-wrapper.cmake b/ports/curl/vcpkg-cmake-wrapper.cmake
@@ -2,6 +2,8 @@ list(REMOVE_ITEM ARGS "NO_MODULE")
 list(REMOVE_ITEM ARGS "CONFIG")
 list(REMOVE_ITEM ARGS "MODULE")
 
+cmake_policy(SET CMP0012 NEW)
+
 _find_package(${ARGS} CONFIG)
 
 if(TARGET CURL::libcurl)

diff --git a/ports/poppler/portfile.cmake b/ports/poppler/portfile.cmake
@@ -10,6 +10,7 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    curl ENABLE_CURL
     zlib ENABLE_ZLIB
 )
 
@@ -21,6 +22,7 @@ vcpkg_configure_cmake(
         -DBUILD_QT5_TESTS=OFF
         -DBUILD_QT6_TESTS=OFF
         -DBUILD_CPP_TESTS=OFF
+        -DENABLE_LIBCURL=${ENABLE_CURL}
         -DENABLE_UTILS=OFF
         -DENABLE_GLIB=OFF
         -DENABLE_GLOBJECT_INTROSPECTION=OFF

diff --git a/ports/poppler/vcpkg.json b/ports/poppler/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "poppler",
   "version-string": "20.12.1",
+  "port-version": 1,
   "description": "a PDF rendering library",
   "homepage": "https://poppler.freedesktop.org/",
   "dependencies": [
@@ -21,6 +22,12 @@
     "zlib"
   ],
   "features": {
+    "curl": {
+      "description": "curl for poppler",
+      "dependencies": [
+        "curl"
+      ]
+    },
     "zlib": {
       "description": "zlib for poppler",
       "dependencies": [