diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-01-23 10:52:49 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-23 10:52:49 -0800 |
| commit | f7672fbf6d23423119424d6975bc1acd78e04aac (patch) | |
| tree | 8cc1daafd63527ce6a1584ff9c7ba4c1a3b9e96e | |
| parent | cfaa7f13cfc8af4c5c8b82fbbdedb9b08c70bfa4 (diff) | |
| parent | b7d5f8cbee375cf4e82f50f1ea5ba74e86ca043b (diff) | |
| download | vcpkg-f7672fbf6d23423119424d6975bc1acd78e04aac.tar.gz vcpkg-f7672fbf6d23423119424d6975bc1acd78e04aac.zip | |
Merge pull request #5220 from ShinNoNoir/libgeotiff-fix-proj4-dep
[libgeotiff] Debug version gets incorrectly linked with release version of PROJ4
| -rw-r--r-- | ports/libgeotiff/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libgeotiff/portfile.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/libgeotiff/CONTROL b/ports/libgeotiff/CONTROL index dea361457..edfa7f0cb 100644 --- a/ports/libgeotiff/CONTROL +++ b/ports/libgeotiff/CONTROL @@ -1,4 +1,4 @@ Source: libgeotiff -Version: 1.4.2-6 +Version: 1.4.2-7 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 afd203b03..fc79fe15d 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -21,6 +21,9 @@ vcpkg_extract_source_archive_ex( 0006-Fix-utility-link-error.patch ) +# Delete FindPROJ4.cmake +file(REMOVE ${SOURCE_PATH}/cmake/FindPROJ4.cmake) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA |