aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhoebe <20694052+PhoebeHui@users.noreply.github.com>2020-12-02 02:01:02 +0800
committerGitHub <noreply@github.com>2020-12-01 10:01:02 -0800
commit46e6bad823b02b2afd067b114fe52957dacc8af2 (patch)
tree6b3dfa9d424a7064387637341c02fbd446f19b36
parent65d742a57d9f6db031f8e9a356feb1dca4211cd3 (diff)
downloadvcpkg-46e6bad823b02b2afd067b114fe52957dacc8af2.tar.gz
vcpkg-46e6bad823b02b2afd067b114fe52957dacc8af2.zip
[gdal] Fix build errors on linux and osx (#14866)
-rw-r--r--ports/gdal/CONTROL1
-rw-r--r--ports/gdal/portfile.cmake1
2 files changed, 2 insertions, 0 deletions
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
index 00177bc06..36944edce 100644
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@@ -1,5 +1,6 @@
Source: gdal
Version: 3.1.3
+Port-Version: 1
Homepage: https://gdal.org/
Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib, libgeotiff, cfitsio, json-c (!windows)
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index 8675d8ced..c1fca47a8 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -186,6 +186,7 @@ else()
set(CONF_OPTS --enable-shared=${BUILD_DYNAMIC} --enable-static=${BUILD_STATIC})
list(APPEND CONF_OPTS --with-proj=${CURRENT_INSTALLED_DIR} --with-libjson-c=${CURRENT_INSTALLED_DIR})
+ list(APPEND CONF_OPTS --without-jasper)
vcpkg_configure_make(
SOURCE_PATH ${SOURCE_PATH}