diff options
| author | Kai Pastor <dg0yt@darc.de> | 2021-04-12 20:14:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-12 11:14:09 -0700 |
| commit | fc07d6946c7f0a10b5e0f240e6303a06a675e35c (patch) | |
| tree | 03d5f05c45e761166eb75fe0d3929f05858b8ae9 | |
| parent | e1e681f71b219b5673023dfe045e737955554897 (diff) | |
| download | vcpkg-fc07d6946c7f0a10b5e0f240e6303a06a675e35c.tar.gz vcpkg-fc07d6946c7f0a10b5e0f240e6303a06a675e35c.zip | |
[libgeotiff] Fix mingw build (#17206)
* Provide install dir parameters
Fixes a build error with MINGW.
* Update version
| -rw-r--r-- | ports/libgeotiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libgeotiff/portfile.cmake | 3 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libgeotiff.json | 5 |
4 files changed, 9 insertions, 3 deletions
diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index c51eb962e..54e9022b8 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,6 +1,6 @@ Source: libgeotiff Version: 1.6.0 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/OSGeo/libgeotiff Description: Libgeotiff is an open source library normally hosted on top of libtiff for reading, and writing GeoTIFF information tags. Build-Depends: tiff, proj4, zlib, libjpeg-turbo diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index 952ce8fe9..967c7cd78 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -21,6 +21,8 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS + -DGEOTIFF_BIN_SUBDIR=bin + -DGEOTIFF_DATA_SUBDIR=share -DWITH_TIFF=1 -DWITH_PROJ4=1 -DWITH_ZLIB=1 @@ -44,4 +46,3 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(RENAME ${CURRENT_PACKAGES_DIR}/doc ${CURRENT_PACKAGES_DIR}/share/${PORT}/doc) diff --git a/versions/baseline.json b/versions/baseline.json index a32a091dc..5ec1eb5c1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3082,7 +3082,7 @@ }, "libgeotiff": { "baseline": "1.6.0", - "port-version": 1 + "port-version": 2 }, "libgit2": { "baseline": "1.1.0", diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json index f132e5033..7e6867b16 100644 --- a/versions/l-/libgeotiff.json +++ b/versions/l-/libgeotiff.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7cd5cd08571c3a463ea30e6b47a6e407301199fe", + "version-string": "1.6.0", + "port-version": 2 + }, + { "git-tree": "413293d224293f65999b988ba07734ad78793405", "version-string": "1.6.0", "port-version": 1 |