[gdal] Use upstream WebP config

microsoft · Jan 26, 2023 · 78bbfee · 78bbfee
1 parent b8012b5
commit 78bbfee
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/ports/gdal/cmake-project-include.cmake b/ports/gdal/cmake-project-include.cmake
@@ -0,0 +1,6 @@
+if(GDAL_USE_WEBP)
+    find_package(WebP CONFIG REQUIRED)
+    add_library(WEBP::WebP ALIAS WebP::webp)
+    set(GDAL_CHECK_PACKAGE_WebP_NAMES WebP CACHE INTERNAL "vcpkg")
+    set(GDAL_CHECK_PACKAGE_WebP_TARGETS WebP::webp CACHE INTERNAL "vcpkg")
+endif()
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
@@ -91,6 +91,7 @@ vcpkg_cmake_configure(
         -DGDAL_CHECK_PACKAGE_QHULL_NAMES=Qhull
         "-DGDAL_CHECK_PACKAGE_QHULL_TARGETS=${qhull_target}"
         "-DQHULL_LIBRARY=${qhull_target}"
+        -DCMAKE_PROJECT_INCLUDE="${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
     OPTIONS_DEBUG
         -DBUILD_APPS=OFF
     MAYBE_UNUSED_VARIABLES

diff --git a/ports/gdal/vcpkg.json b/ports/gdal/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gdal",
   "version-semver": "3.6.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",
   "license": null,

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2586,7 +2586,7 @@
     },
     "gdal": {
       "baseline": "3.6.2",
-      "port-version": 1
+      "port-version": 2
     },
     "gdcm": {
       "baseline": "3.0.12",

diff --git a/versions/g-/gdal.json b/versions/g-/gdal.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "11923340f9057d7e444b83e7a06afbf50e67e0d1",
+      "version-semver": "3.6.2",
+      "port-version": 2
+    },
     {
       "git-tree": "3a5646f7afab7b9f78bd8b874df4e2b3355b4a1a",
       "version-semver": "3.6.2",