diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-07-26 20:11:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-26 11:11:05 -0700 |
| commit | bbf9b17d32d0163655a2da489aea2e446915aa28 (patch) | |
| tree | ab21c73e87e30fd2db8f20b4b170d14fe838c2df | |
| parent | ed98cae63fef90783a1a5c024564514610860a1d (diff) | |
| download | vcpkg-bbf9b17d32d0163655a2da489aea2e446915aa28.tar.gz vcpkg-bbf9b17d32d0163655a2da489aea2e446915aa28.zip | |
[gdal] Fix GDAL_LIBRARY passing by cache variable (#19119)
* Fix GDAL_LIBRARY passing by cache variable
* 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, 9 insertions, 2 deletions
diff --git a/ports/gdal/vcpkg-cmake-wrapper.cmake b/ports/gdal/vcpkg-cmake-wrapper.cmake index 8614c35e3..f6241e259 100644 --- a/ports/gdal/vcpkg-cmake-wrapper.cmake +++ b/ports/gdal/vcpkg-cmake-wrapper.cmake @@ -23,6 +23,8 @@ if(NOT GDAL_INCLUDE_DIR OR NOT GDAL_LIBRARY) message(FATAL_ERROR "Installation of vcpkg port gdal is broken.")
endif()
+set(GDAL_LIBRARY "${GDAL_LIBRARY}" CACHE STRING "")
+
set(FindGDAL_SKIP_GDAL_CONFIG TRUE)
_find_package(${ARGS})
diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json index 71e7cbf11..8ef4de49b 100644 --- a/ports/gdal/vcpkg.json +++ b/ports/gdal/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gdal", "version-semver": "3.2.2", - "port-version": 2, + "port-version": 3, "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 14a280d9c..ff4f8eb60 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2218,7 +2218,7 @@ }, "gdal": { "baseline": "3.2.2", - "port-version": 2 + "port-version": 3 }, "gdcm": { "baseline": "3.0.7", diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json index 9d20106b8..d6da35027 100644 --- a/versions/g-/gdal.json +++ b/versions/g-/gdal.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "5bb72450f69322e39e09bea191e5c947833e698d", + "version-semver": "3.2.2", + "port-version": 3 + }, + { "git-tree": "cee8a26ec45230cb4b11e18582b41291b264d82e", "version-semver": "3.2.2", "port-version": 2 |