From 2acd21e5e8c089f17002ff60be8f16ec6b12e5eb Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 23 Jul 2021 22:34:02 +0200 Subject: [gdal] Repair gdal wrapper (#19105) * Repair gdal wrapper * x-add-version --- ports/gdal/vcpkg-cmake-wrapper.cmake | 2 +- ports/gdal/vcpkg.json | 2 +- versions/baseline.json | 2 +- 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,5 +1,10 @@ { "versions": [ + { + "git-tree": "cee8a26ec45230cb4b11e18582b41291b264d82e", + "version-semver": "3.2.2", + "port-version": 2 + }, { "git-tree": "f95d14f55c0bbc629a07da68147324ab4fd0bd58", "version-semver": "3.2.2", -- cgit v1.2.3