diff options
| -rw-r--r-- | ports/libgeotiff/portfile.cmake | 23 | ||||
| -rw-r--r-- | ports/tiff/CONTROL | 4 | ||||
| -rw-r--r-- | ports/tiff/vcpkg-cmake-wrapper.cmake | 11 |
3 files changed, 17 insertions, 21 deletions
diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake index 3f0e1aac0..2c83b451a 100644 --- a/ports/libgeotiff/portfile.cmake +++ b/ports/libgeotiff/portfile.cmake @@ -2,22 +2,23 @@ include(vcpkg_common_functions) set(LIBGEOTIFF_VERSION 1.4.2) set(LIBGEOTIFF_HASH 059c6e05eb0c47f17b102c7217a2e1636e76d622c4d1bdcf0bd89fb3505f3130bffa881e21c73cfd2ca0d6863b81322f85784658ba3539b53b63c3a8f38d1deb) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/1/libgeotiff-${LIBGEOTIFF_VERSION}) vcpkg_download_distfile(ARCHIVE URLS "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz" FILENAME "libgeotiff-${LIBGEOTIFF_VERSION}.tar.gz" - SHA512 ${LIBGEOTIFF_HASH}) - -vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src/1) + SHA512 ${LIBGEOTIFF_HASH} +) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-Updates-to-CMake-configuration-to-align-with-other-C.patch" - "${CMAKE_CURRENT_LIST_DIR}/0002-Fix-directory-output.patch" - "${CMAKE_CURRENT_LIST_DIR}/0004-Fix-libxtiff-installation.patch" - "${CMAKE_CURRENT_LIST_DIR}/0005-Control-shared-library-build-with-option.patch" - "${CMAKE_CURRENT_LIST_DIR}/0006-Fix-utility-link-error.patch" +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + REF ${LIBGEOTIFF_VERSION} + PATCHES + 0001-Updates-to-CMake-configuration-to-align-with-other-C.patch + 0002-Fix-directory-output.patch + 0004-Fix-libxtiff-installation.patch + 0005-Control-shared-library-build-with-option.patch + 0006-Fix-utility-link-error.patch ) vcpkg_configure_cmake( diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 710b7a1c2..d858ff83a 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,4 +1,4 @@ Source: tiff -Version: 4.0.9-4 -Build-Depends: zlib, libjpeg-turbo, liblzma (windows) +Version: 4.0.9-5 +Build-Depends: zlib, libjpeg-turbo, liblzma Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake b/ports/tiff/vcpkg-cmake-wrapper.cmake index 8edcb5e43..5ccb0e7ff 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake @@ -1,23 +1,18 @@ _find_package(${ARGS})
if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")
- set(TIFF_EXTRA_LIBRARIES)
- if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
- find_package(LibLZMA)
- list(APPEND TIFF_EXTRA_LIBRARIES ${LIBLZMA_LIBRARIES})
- endif()
-
+ find_package(LibLZMA)
find_package(JPEG)
find_package(ZLIB)
if(TARGET TIFF::TIFF)
- set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${TIFF_EXTRA_LIBRARIES} JPEG::JPEG ZLIB::ZLIB)
+ set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${LIBLZMA_LIBRARIES} JPEG::JPEG ZLIB::ZLIB)
if(UNIX)
set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES m)
endif()
endif()
if(TIFF_LIBRARIES)
- list(APPEND TIFF_LIBRARIES ${TIFF_EXTRA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
+ list(APPEND TIFF_LIBRARIES ${LIBLZMA_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES})
if(UNIX)
list(APPEND TIFF_LIBRARIES m)
endif()
|