aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorKai Pastor <dg0yt@darc.de>2021-07-26 20:11:05 +0200
committerGitHub <noreply@github.com>2021-07-26 11:11:05 -0700
commitbbf9b17d32d0163655a2da489aea2e446915aa28 (patch)
treeab21c73e87e30fd2db8f20b4b170d14fe838c2df /ports
parented98cae63fef90783a1a5c024564514610860a1d (diff)
downloadvcpkg-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
Diffstat (limited to 'ports')
-rw-r--r--ports/gdal/vcpkg-cmake-wrapper.cmake2
-rw-r--r--ports/gdal/vcpkg.json2
2 files changed, 3 insertions, 1 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",