mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 04:53:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[gdal] Fix building for 32bit Android and msvc with poppler (#25190)

Browse Source 
* [gdal] Fix building for 32bit Android

* [gdal] Adjust poppler version

Fixes a compiler error

* [gdal] Bump port version
This commit is contained in:
Matthias Kuhn 2022-06-15 20:17:57 +02:00 committed by GitHub
parent 4e443a30b9
commit d2f3f30607
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/gdal/dependency_win.cmake
View File

@ -137,7 +137,7 @@ macro(find_dependency_win)
if("poppler" IN_LIST FEATURES)
list(APPEND NMAKE_OPTIONS "POPPLER_ENABLED=YES")
list(APPEND NMAKE_OPTIONS "POPPLER_MAJOR_VERSION=22" "POPPLER_MINOR_VERSION=1") # Bump as needed
list(APPEND NMAKE_OPTIONS "POPPLER_MAJOR_VERSION=22" "POPPLER_MINOR_VERSION=3") # Bump as needed
list(APPEND NMAKE_OPTIONS "POPPLER_CFLAGS=-I${CURRENT_INSTALLED_DIR}/include -I${CURRENT_INSTALLED_DIR}/include/poppler /std:c++17")
x_vcpkg_pkgconfig_get_modules(PREFIX POPPLER MODULES --msvc-syntax poppler LIBS)
list(APPEND NMAKE_OPTIONS_REL "POPPLER_LIBS=${POPPLER_LIBS_RELEASE}")

4
ports/gdal/portfile.cmake
View File

@ -288,6 +288,10 @@ else()
list(APPEND CONF_OPTS "--with-tools=no")
endif()
if(VCPKG_TARGET_IS_ANDROID AND (VCPKG_TARGET_ARCHITECTURE MATCHES "x86" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm"))
list(APPEND CONF_OPTS --with-unix-stdio-64=no)
endif()
vcpkg_configure_make(
SOURCE_PATH "${SOURCE_PATH}/gdal"
AUTOCONFIG

2
ports/gdal/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "gdal",
"version-semver": "3.4.3",
"port-version": 1,
"port-version": 2,
"description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
"homepage": "https://gdal.org",
"license": null,

2
versions/baseline.json
View File

@ -2458,7 +2458,7 @@
},
"gdal": {
"baseline": "3.4.3",
"port-version": 1
"port-version": 2
},
"gdcm": {
"baseline": "3.0.12",

5
versions/g-/gdal.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "509d3e54670e6552cce8d811a329d6c28589392e",
"version-semver": "3.4.3",
"port-version": 2
},
{
"git-tree": "8bdf8b8ff951c1ce8719c789e66ac3a166eed063",
"version-semver": "3.4.3",