mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 09:41:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5220 from ShinNoNoir/libgeotiff-fix-proj4-dep

Browse Source 
[libgeotiff] Debug version gets incorrectly linked with release version of PROJ4
This commit is contained in:
Victor Romero 2019-01-23 10:52:49 -08:00 committed by GitHub
commit f7672fbf6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libgeotiff/CONTROL
View File

@ -1,4 +1,4 @@
Source: libgeotiff 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. 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 Build-Depends: tiff, proj4, zlib, libjpeg-turbo

3
ports/libgeotiff/portfile.cmake
View File

@ -21,6 +21,9 @@ vcpkg_extract_source_archive_ex(
0006-Fix-utility-link-error.patch 0006-Fix-utility-link-error.patch
) )
# Delete FindPROJ4.cmake
file(REMOVE ${SOURCE_PATH}/cmake/FindPROJ4.cmake)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA PREFER_NINJA