diff options
| author | Raynor Vliegendhart <shinnonoir+git@gmail.com> | 2019-01-23 10:35:53 +0100 |
|---|---|---|
| committer | Raynor Vliegendhart <shinnonoir+git@gmail.com> | 2019-01-23 10:35:53 +0100 |
| commit | b7d5f8cbee375cf4e82f50f1ea5ba74e86ca043b (patch) | |
| tree | 7230bbfa997615771efa0c54d035b3ccb00c2439 | |
| parent | 07f1d2f44b4d8709cfeefaec5b6290b95baf7a64 (diff) | |
| download | vcpkg-b7d5f8cbee375cf4e82f50f1ea5ba74e86ca043b.tar.gz vcpkg-b7d5f8cbee375cf4e82f50f1ea5ba74e86ca043b.zip | |
[libgeotiff] Remove FindPROJ4.cmake from src
The GeoTIFF library ships with its own FindPROJ4.cmake module. This file
interferes with the cmake files that are installed by vcpkg for the PROJ4
package. As a result, the debug version of libgeotiff gets incorrectly
linked to the release version of PROJ4. By removing FindPROJ4.cmake from
the source directory, the vcpkg's .cmake files are used instead,
allowing CMake to find the debug version of PROJ4 when building the
debug version of libgeotiff.
| -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 |