diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-07-23 22:34:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 13:34:02 -0700 |
| commit | 2acd21e5e8c089f17002ff60be8f16ec6b12e5eb (patch) | |
| tree | 82858cdba4dc46a2fdfffa3f0b3e2f476c05ac33 | |
| parent | 4990d2b9510876531eb7e73eeba09210178e804f (diff) | |
| download | vcpkg-2acd21e5e8c089f17002ff60be8f16ec6b12e5eb.tar.gz vcpkg-2acd21e5e8c089f17002ff60be8f16ec6b12e5eb.zip | |
[gdal] Repair gdal wrapper (#19105)
* Repair gdal wrapper
* x-add-version
| -rw-r--r-- | ports/gdal/vcpkg-cmake-wrapper.cmake | 2 | ||||
| -rw-r--r-- | ports/gdal/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/g-/gdal.json | 5 |
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 1448956d1..8614c35e3 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -92,7 +92,7 @@ if(GDAL_FOUND) _gdal_add_dependency(ZLIB::ZLIB ZLIB)
_gdal_add_dependency(zstd::libzstd zstd CONFIG)
list(FIND ARGS "REQUIRED" required)
- if(NOT required EQUAL "-1")
+ if(NOT GDAL_FOUND AND NOT required EQUAL "-1")
message(FATAL_ERROR "Failed to find dependencies of GDAL")
endif()
endif()
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 7bc8db99d..71e7cbf11 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", - "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", "supports": "!arm", diff --git a/versions/baseline.json b/versions/baseline.json index 049fab1bc..b35f9fc19 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2218,7 +2218,7 @@ }, "gdal": { "baseline": "3.2.2", - "port-version": 1 + "port-version": 2 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 649654b4b..9d20106b8 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "cee8a26ec45230cb4b11e18582b41291b264d82e", + "version-semver": "3.2.2", + "port-version": 2 + }, + { "git-tree": "f95d14f55c0bbc629a07da68147324ab4fd0bd58", "version-semver": "3.2.2", "port-version": 1 |