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

[gdal] Fix build without poppler (#30422)

Browse Source
This commit is contained in:
Kai Pastor 2023-03-28 22:50:19 +02:00 committed by GitHub
parent a0bfd30d68
commit 8fdb0f2e58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/gdal/find-link-libraries.patch
View File

@ -58,7 +58,7 @@ index 3807ec0..8059eb4 100644
endif() endif()
endif() endif()
+if(PC_Poppler_FOUND) +if(PC_Poppler_FOUND)
+ find_path(Poppler_INCLUDE_DIR NAMES Object.h PATHS ${PC_Poppler_INCLUDE_DIRS} NO_DEFAULT_PATH REQUIRED) + find_path(Poppler_INCLUDE_DIR NAMES Object.h PATHS ${PC_Poppler_INCLUDE_DIRS} NO_DEFAULT_PATH)
+ set(Poppler_LIBRARY "${PC_Poppler_LIBRARIES}" CACHE STRING "") + set(Poppler_LIBRARY "${PC_Poppler_LIBRARIES}" CACHE STRING "")
+ if(NOT TARGET Poppler::Poppler) + if(NOT TARGET Poppler::Poppler)
+ add_library(Poppler::Poppler INTERFACE IMPORTED) + add_library(Poppler::Poppler INTERFACE IMPORTED)

1
ports/gdal/vcpkg.json
View File

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

2
versions/baseline.json
View File

@ -2682,7 +2682,7 @@
}, },
"gdal": { "gdal": {
"baseline": "3.6.3", "baseline": "3.6.3",
"port-version": 0 "port-version": 1
}, },
"gdcm": { "gdcm": {
"baseline": "3.0.12", "baseline": "3.0.12",

5
versions/g-/gdal.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "fd3b78eb622e4b5f176e4c72cb9aa855f1e6d985",
"version-semver": "3.6.3",
"port-version": 1
},
{ {
"git-tree": "145b046001c2cbbddc6e987df1f24cde16c32c99", "git-tree": "145b046001c2cbbddc6e987df1f24cde16c32c99",
"version-semver": "3.6.3", "version-semver": "3.6.3",