From 9db3ff7a06d0afaa59d8f51563e8de6e0c1a8cba Mon Sep 17 00:00:00 2001 From: Thomas Gwynne-Timothy Date: Fri, 15 May 2020 18:04:10 -0600 Subject: [PATCH] [tiff] Install runtime deps for tiff[tool] (#11364) * Install runtime deps for tiff[tool] fixes microsoft/vcpkg#11361 * Remove deprecated include * Increment port version --- ports/tiff/CONTROL | 2 +- ports/tiff/portfile.cmake | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ports/tiff/CONTROL b/ports/tiff/CONTROL index 270455ca2..d8f79b2f9 100644 --- a/ports/tiff/CONTROL +++ b/ports/tiff/CONTROL @@ -1,5 +1,5 @@ Source: tiff -Version: 4.0.10-8 +Version: 4.0.10-9 Build-Depends: zlib, libjpeg-turbo, liblzma Homepage: https://download.osgeo.org/libtiff Description: A library that supports the manipulation of TIFF image files diff --git a/ports/tiff/portfile.cmake b/ports/tiff/portfile.cmake index d09aa10ef..828e8ec0b 100644 --- a/ports/tiff/portfile.cmake +++ b/ports/tiff/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - set(LIBTIFF_VERSION 4.0.10) vcpkg_download_distfile(ARCHIVE @@ -57,10 +55,11 @@ file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/ if ("tool" IN_LIST FEATURES) file(GLOB TIFF_TOOLS ${CURRENT_PACKAGES_DIR}/bin/*.exe) file(INSTALL ${TIFF_TOOLS} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(REMOVE ${TIFF_TOOLS}) file(GLOB TIFF_TOOLS ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) file(REMOVE ${TIFF_TOOLS}) - + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) endif()