Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jan 8, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09e718b
[poppler] Fix issue with using libcurl.
Hoikas Jan 7, 2021
34db382
[curl] Ensure CMake policy is set for the libcurl config file.
Hoikas Jan 7, 2021
0454c47
[poppler] Add curl feature to test curl vcpkg-cmake-wrapper.
Hoikas Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/curl/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions ports/curl/vcpkg-cmake-wrapper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions ports/poppler/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ vcpkg_from_github(
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
curl ENABLE_CURL
zlib ENABLE_ZLIB
)

Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions ports/poppler/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -21,6 +22,12 @@
"zlib"
],
"features": {
"curl": {
"description": "curl for poppler",
"dependencies": [
"curl"
]
},
"zlib": {
"description": "zlib for poppler",
"dependencies": [
Expand Down