Skip to content

Commit a709539

Browse files
authored
Merge pull request #6982 from BOINC/vko_update_vcpkg_custom_ports
[ci] update custom gdk-pixbuf vcpkg port
2 parents e828abb + 1dacaf1 commit a709539

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

3rdParty/vcpkg_ports/ports/gdk-pixbuf/portfile.cmake

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,12 @@ if(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_WINDOWS)
6161
list(APPEND OPTIONS -Drelocatable=true)
6262
endif()
6363

64-
if(VCPKG_TARGET_IS_ANDROID AND VCPKG_DETECTED_CMAKE_SYSTEM_VERSION VERSION_LESS "31")
65-
list(APPEND OPTIONS -Dandroid=disabled)
64+
if(VCPKG_TARGET_IS_ANDROID)
65+
vcpkg_cmake_get_vars(cmake_vars_file)
66+
include("${cmake_vars_file}")
67+
if(VCPKG_DETECTED_CMAKE_SYSTEM_VERSION VERSION_LESS "31")
68+
list(APPEND OPTIONS -Dandroid=disabled)
69+
endif()
6670
endif()
6771

6872
if(VCPKG_TARGET_IS_WINDOWS)

3rdParty/vcpkg_ports/ports/gdk-pixbuf/vcpkg.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"name": "gdk-pixbuf",
33
"version": "2.44.6",
4+
"port-version": 1,
45
"description": "Image loading library.",
56
"homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf",
67
"license": "LGPL-2.1-or-later",
@@ -20,6 +21,11 @@
2021
"name": "glib",
2122
"host": true
2223
},
24+
{
25+
"name": "vcpkg-cmake-get-vars",
26+
"host": true,
27+
"platform": "android"
28+
},
2329
{
2430
"name": "vcpkg-tool-meson",
2531
"host": true

0 commit comments

Comments
 (0)