diff options
| author | Adam Johnson <AdamJohnso@gmail.com> | 2021-01-08 14:07:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-08 11:07:00 -0800 |
| commit | 1a4c54f1f16a5f290fb55297b2ee5f59fe416928 (patch) | |
| tree | 03de20d73fe27cf16d14db9a72a5f93c55e20a90 | |
| parent | 36cd5101198e0d05407982ce05e20ca854d12435 (diff) | |
| download | vcpkg-1a4c54f1f16a5f290fb55297b2ee5f59fe416928.tar.gz vcpkg-1a4c54f1f16a5f290fb55297b2ee5f59fe416928.zip | |
[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.
| -rw-r--r-- | ports/curl/CONTROL | 2 | ||||
| -rw-r--r-- | ports/curl/vcpkg-cmake-wrapper.cmake | 2 | ||||
| -rw-r--r-- | ports/poppler/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/poppler/vcpkg.json | 7 |
4 files changed, 12 insertions, 1 deletions
diff --git a/ports/curl/CONTROL b/ports/curl/CONTROL index 82698dca9..6253ca7e9 100644 --- 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 index c7fbdba91..955d9353a 100644 --- 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 index 2b1e453e8..89345f0a0 100644 --- 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 index ad12769e0..71cb470c5 100644 --- 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": [ |