From 2a4babf5c20e8ff44171ce804155f47d9e227961 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 16 Jun 2021 08:25:17 +0200 Subject: [PATCH 01/12] Revise tiff cmake wrapper --- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 112 ++++++++++++++++-------- ports/tiff/vcpkg.json | 2 +- 2 files changed, 76 insertions(+), 38 deletions(-) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index cd356483a7d0a7..06b9901b970b8d 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -1,49 +1,87 @@ -_find_package(${ARGS}) - -set(_tiff_features ";@FEATURES@;") +cmake_policy(PUSH) +cmake_policy(SET CMP0057 NEW) +set(_tiff_find_args "${ARGS}") +set(_tiff_features "@FEATURES@") set(_tiff_link_libraries "") set(_tiff_libraries "") -if(_tiff_features MATCHES ";webp;") - find_package(WebP CONFIG REQUIRED) - list(APPEND _tiff_link_libraries WebP::WebP) - list(APPEND _tiff_libraries ${WEBP_LIBRARIES}) -endif() -if(_tiff_features MATCHES ";lzma;") - find_package(LibLZMA CONFIG REQUIRED) - list(APPEND _tiff_link_libraries LibLZMA::LibLZMA) - list(APPEND _tiff_libraries ${LZMA_LIBRARIES}) -endif() -if(_tiff_features MATCHES ";jpeg;") - find_package(JPEG REQUIRED) - list(APPEND _tiff_link_libraries JPEG::JPEG) - list(APPEND _tiff_libraries ${JPEG_LIBRARIES}) -endif() -if(_tiff_features MATCHES ";zstd;") - find_package(ZSTD CONFIG REQUIRED) - if(TARGET zstd::libzstd_shared) - set(_tiff_zstd zstd::libzstd_shared) +set(_tiff_incomplete FALSE) +set(_tiff_find_options "") +if("REQUIRED" IN_LIST ARGS) + list(APPEND _tiff_find_options "REQUIRED") +endif() +if("webp" IN_LIST _tiff_features) + find_package(WebP CONFIG ${_tiff_find_options}) + if(WebP_FOUND) + list(APPEND _tiff_link_libraries WebP::WebP) + list(APPEND _tiff_libraries ${WEBP_LIBRARIES}) + else() + set(_tiff_incomplete TRUE) + endif() +endif() +if("lzma" IN_LIST _tiff_features) + find_package(LibLZMA CONFIG ${_tiff_find_options}) + if(LibLZMA_FOUND) + list(APPEND _tiff_link_libraries LibLZMA::LibLZMA) + list(APPEND _tiff_libraries ${LZMA_LIBRARIES}) + else() + set(_tiff_incomplete TRUE) + endif() +endif() +if("jpeg" IN_LIST _tiff_features) + find_package(JPEG ${_tiff_find_options}) + if(JPEG_FOUND) + list(APPEND _tiff_link_libraries JPEG::JPEG) + list(APPEND _tiff_libraries ${JPEG_LIBRARIES}) + else() + set(_tiff_incomplete TRUE) + endif() +endif() +if("zstd" IN_LIST _tiff_features) + find_package(ZSTD CONFIG ${_tiff_find_options}) + if(ZSTD_FOUND) + if(TARGET zstd::libzstd_shared) + set(_tiff_zstd zstd::libzstd_shared) + else() + set(_tiff_zstd zstd::libzstd_static) + endif() + list(APPEND _tiff_link_libraries ${_tiff_zstd}) + list(APPEND _tiff_libraries ${_tiff_zstd}) else() - set(_tiff_zstd zstd::libzstd_static) + set(_tiff_incomplete TRUE) endif() - list(APPEND _tiff_link_libraries ${_tiff_zstd}) - list(APPEND _tiff_libraries ${_tiff_zstd}) endif() -if(_tiff_features MATCHES ";zip;") - find_package(ZLIB REQUIRED) - list(APPEND _tiff_link_libraries ZLIB::ZLIB) - list(APPEND _tiff_libraries ${ZLIB_LIBRARIES}) +if("zip" IN_LIST _tiff_features) + find_package(ZLIB ${_tiff_find_options}) + if(ZLIB_FOUND) + list(APPEND _tiff_link_libraries ZLIB::ZLIB) + list(APPEND _tiff_libraries ${ZLIB_LIBRARIES}) + else() + set(_tiff_incomplete TRUE) + endif() endif() if(UNIX) list(APPEND _tiff_link_libraries m) list(APPEND _tiff_libraries m) endif() -if(TARGET TIFF::TIFF) - set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${_tiff_link_libraries}) -endif() -if(TIFF_LIBRARIES) - list(APPEND TIFF_LIBRARIES ${_tiff_libraries}) -endif() -if(TIFF_LIBRARY) - list(APPEND TIFF_LIBRARY ${_tiff_libraries}) +if(_tiff_incomplete) + set(TIFF_FOUND FALSE) +else() + _find_package(${_tiff_find_args}) + if(TARGET TIFF::TIFF) + set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${_tiff_link_libraries}) + endif() + if(TIFF_LIBRARIES) + list(APPEND TIFF_LIBRARIES ${_tiff_libraries}) + endif() + if(TIFF_LIBRARY) + list(APPEND TIFF_LIBRARY ${_tiff_libraries}) + endif() endif() +unset(_tiff_find_args) +unset(_tiff_features) +unset(_tiff_link_libraries) +unset(_tiff_libraries) +unset(_tiff_incomplete) +unset(_tiff_find_options) +cmake_policy(POP) diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json index f31b99cdce643e..764fcf55dec36c 100644 --- a/ports/tiff/vcpkg.json +++ b/ports/tiff/vcpkg.json @@ -1,7 +1,7 @@ { "name": "tiff", "version": "4.3.0", - "port-version": 1, + "port-version": 2, "description": "A library that supports the manipulation of TIFF image files", "homepage": "https://libtiff.gitlab.io/libtiff/", "dependencies": [ From bb4bbad5e57c81e89bbd1d2aad1d2fc4cb0e6613 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 18 Aug 2021 17:38:49 +0200 Subject: [PATCH 02/12] x-add-version --- versions/baseline.json | 2 +- versions/t-/tiff.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 28551738f9eb5a..2ac803e846164a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6286,7 +6286,7 @@ }, "tiff": { "baseline": "4.3.0", - "port-version": 1 + "port-version": 2 }, "tinkerforge": { "baseline": "2.1.25", diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index fb7ecc60db664c..1c04075398fa7f 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a732eeeae7815d538503ba90f28b5f011325fcd5", + "version": "4.3.0", + "port-version": 2 + }, { "git-tree": "c8d1b0803b30c4fd2ea762d62b8d43cd09ff40f0", "version": "4.3.0", From 9b1f077314e26ce09b2eea8f21e9ce794eeb348f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Aug 2021 00:07:16 +0200 Subject: [PATCH 03/12] Use variables from vcpkg_check_features --- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 06b9901b970b8d..8b8c08e588867e 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -1,7 +1,6 @@ cmake_policy(PUSH) cmake_policy(SET CMP0057 NEW) set(_tiff_find_args "${ARGS}") -set(_tiff_features "@FEATURES@") set(_tiff_link_libraries "") set(_tiff_libraries "") set(_tiff_incomplete FALSE) @@ -9,7 +8,7 @@ set(_tiff_find_options "") if("REQUIRED" IN_LIST ARGS) list(APPEND _tiff_find_options "REQUIRED") endif() -if("webp" IN_LIST _tiff_features) +if(@webp@) find_package(WebP CONFIG ${_tiff_find_options}) if(WebP_FOUND) list(APPEND _tiff_link_libraries WebP::WebP) @@ -18,7 +17,7 @@ if("webp" IN_LIST _tiff_features) set(_tiff_incomplete TRUE) endif() endif() -if("lzma" IN_LIST _tiff_features) +if(@lzma@) find_package(LibLZMA CONFIG ${_tiff_find_options}) if(LibLZMA_FOUND) list(APPEND _tiff_link_libraries LibLZMA::LibLZMA) @@ -27,7 +26,7 @@ if("lzma" IN_LIST _tiff_features) set(_tiff_incomplete TRUE) endif() endif() -if("jpeg" IN_LIST _tiff_features) +if(@jpeg@) find_package(JPEG ${_tiff_find_options}) if(JPEG_FOUND) list(APPEND _tiff_link_libraries JPEG::JPEG) @@ -36,7 +35,7 @@ if("jpeg" IN_LIST _tiff_features) set(_tiff_incomplete TRUE) endif() endif() -if("zstd" IN_LIST _tiff_features) +if(@zstd@) find_package(ZSTD CONFIG ${_tiff_find_options}) if(ZSTD_FOUND) if(TARGET zstd::libzstd_shared) @@ -50,7 +49,7 @@ if("zstd" IN_LIST _tiff_features) set(_tiff_incomplete TRUE) endif() endif() -if("zip" IN_LIST _tiff_features) +if(@zlib@) find_package(ZLIB ${_tiff_find_options}) if(ZLIB_FOUND) list(APPEND _tiff_link_libraries ZLIB::ZLIB) @@ -79,7 +78,6 @@ else() endif() endif() unset(_tiff_find_args) -unset(_tiff_features) unset(_tiff_link_libraries) unset(_tiff_libraries) unset(_tiff_incomplete) From 03288b85347adc2c0f43cd412b226786eed4703d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Aug 2021 00:10:21 +0200 Subject: [PATCH 04/12] x-add-version --- versions/t-/tiff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 1c04075398fa7f..25254285399b4b 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a732eeeae7815d538503ba90f28b5f011325fcd5", + "git-tree": "26d9332ead58444ae8ec586ee61d4e7333116a1c", "version": "4.3.0", "port-version": 2 }, From 6ecc92ff76aecbc6279c7a7c9a9f12a57ff9a219 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Aug 2021 22:45:17 +0200 Subject: [PATCH 05/12] Set CMP0012 to allow 'if(ON)' --- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 8b8c08e588867e..1251197ba888bc 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -1,4 +1,5 @@ cmake_policy(PUSH) +cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0057 NEW) set(_tiff_find_args "${ARGS}") set(_tiff_link_libraries "") From f8deebc2ebbe6a17bfcda327724f32cece24134a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 25 Aug 2021 22:45:31 +0200 Subject: [PATCH 06/12] x-add-version --- versions/t-/tiff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 25254285399b4b..5c84ed36aeac8f 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "26d9332ead58444ae8ec586ee61d4e7333116a1c", + "git-tree": "aab7feb7ca21fc2343fff20bf27d92a95d0b5e69", "version": "4.3.0", "port-version": 2 }, From 8b45b0d8542f2ed0528a0ad1fc9321558b7c5f39 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Sep 2021 10:47:35 +0200 Subject: [PATCH 07/12] Restore early call to _find_package --- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 1251197ba888bc..8fc7ea31ea16f3 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -1,7 +1,6 @@ cmake_policy(PUSH) cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0057 NEW) -set(_tiff_find_args "${ARGS}") set(_tiff_link_libraries "") set(_tiff_libraries "") set(_tiff_incomplete FALSE) @@ -9,6 +8,9 @@ set(_tiff_find_options "") if("REQUIRED" IN_LIST ARGS) list(APPEND _tiff_find_options "REQUIRED") endif() + +_find_package(${ARGS}) + if(@webp@) find_package(WebP CONFIG ${_tiff_find_options}) if(WebP_FOUND) @@ -67,7 +69,6 @@ endif() if(_tiff_incomplete) set(TIFF_FOUND FALSE) else() - _find_package(${_tiff_find_args}) if(TARGET TIFF::TIFF) set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${_tiff_link_libraries}) endif() @@ -78,7 +79,6 @@ else() list(APPEND TIFF_LIBRARY ${_tiff_libraries}) endif() endif() -unset(_tiff_find_args) unset(_tiff_link_libraries) unset(_tiff_libraries) unset(_tiff_incomplete) From d7d6bc57c69ca48c66b331bd3394cd1197ca806c Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Sep 2021 10:56:15 +0200 Subject: [PATCH 08/12] Move wrapper vars to z_vcpkg namespace --- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 74 ++++++++++++------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 8fc7ea31ea16f3..2d76854678ef85 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -1,86 +1,86 @@ cmake_policy(PUSH) cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0057 NEW) -set(_tiff_link_libraries "") -set(_tiff_libraries "") -set(_tiff_incomplete FALSE) -set(_tiff_find_options "") +set(z_vcpkg_tiff_link_libraries "") +set(z_vcpkg_tiff_libraries "") +set(z_vcpkg_tiff_incomplete FALSE) +set(z_vcpkg_tiff_find_options "") if("REQUIRED" IN_LIST ARGS) - list(APPEND _tiff_find_options "REQUIRED") + list(APPEND z_vcpkg_tiff_find_options "REQUIRED") endif() _find_package(${ARGS}) if(@webp@) - find_package(WebP CONFIG ${_tiff_find_options}) + find_package(WebP CONFIG ${z_vcpkg_tiff_find_options}) if(WebP_FOUND) - list(APPEND _tiff_link_libraries WebP::WebP) - list(APPEND _tiff_libraries ${WEBP_LIBRARIES}) + list(APPEND z_vcpkg_tiff_link_libraries WebP::WebP) + list(APPEND z_vcpkg_tiff_libraries ${WEBP_LIBRARIES}) else() - set(_tiff_incomplete TRUE) + set(z_vcpkg_tiff_incomplete TRUE) endif() endif() if(@lzma@) - find_package(LibLZMA CONFIG ${_tiff_find_options}) + find_package(LibLZMA CONFIG ${z_vcpkg_tiff_find_options}) if(LibLZMA_FOUND) - list(APPEND _tiff_link_libraries LibLZMA::LibLZMA) - list(APPEND _tiff_libraries ${LZMA_LIBRARIES}) + list(APPEND z_vcpkg_tiff_link_libraries LibLZMA::LibLZMA) + list(APPEND z_vcpkg_tiff_libraries ${LZMA_LIBRARIES}) else() - set(_tiff_incomplete TRUE) + set(z_vcpkg_tiff_incomplete TRUE) endif() endif() if(@jpeg@) - find_package(JPEG ${_tiff_find_options}) + find_package(JPEG ${z_vcpkg_tiff_find_options}) if(JPEG_FOUND) - list(APPEND _tiff_link_libraries JPEG::JPEG) - list(APPEND _tiff_libraries ${JPEG_LIBRARIES}) + list(APPEND z_vcpkg_tiff_link_libraries JPEG::JPEG) + list(APPEND z_vcpkg_tiff_libraries ${JPEG_LIBRARIES}) else() - set(_tiff_incomplete TRUE) + set(z_vcpkg_tiff_incomplete TRUE) endif() endif() if(@zstd@) - find_package(ZSTD CONFIG ${_tiff_find_options}) + find_package(ZSTD CONFIG ${z_vcpkg_tiff_find_options}) if(ZSTD_FOUND) if(TARGET zstd::libzstd_shared) - set(_tiff_zstd zstd::libzstd_shared) + set(z_vcpkg_tiff_zstd zstd::libzstd_shared) else() - set(_tiff_zstd zstd::libzstd_static) + set(z_vcpkg_tiff_zstd zstd::libzstd_static) endif() - list(APPEND _tiff_link_libraries ${_tiff_zstd}) - list(APPEND _tiff_libraries ${_tiff_zstd}) + list(APPEND z_vcpkg_tiff_link_libraries ${z_vcpkg_tiff_zstd}) + list(APPEND z_vcpkg_tiff_libraries ${z_vcpkg_tiff_zstd}) else() - set(_tiff_incomplete TRUE) + set(z_vcpkg_tiff_incomplete TRUE) endif() endif() if(@zlib@) - find_package(ZLIB ${_tiff_find_options}) + find_package(ZLIB ${z_vcpkg_tiff_find_options}) if(ZLIB_FOUND) - list(APPEND _tiff_link_libraries ZLIB::ZLIB) - list(APPEND _tiff_libraries ${ZLIB_LIBRARIES}) + list(APPEND z_vcpkg_tiff_link_libraries ZLIB::ZLIB) + list(APPEND z_vcpkg_tiff_libraries ${ZLIB_LIBRARIES}) else() - set(_tiff_incomplete TRUE) + set(z_vcpkg_tiff_incomplete TRUE) endif() endif() if(UNIX) - list(APPEND _tiff_link_libraries m) - list(APPEND _tiff_libraries m) + list(APPEND z_vcpkg_tiff_link_libraries m) + list(APPEND z_vcpkg_tiff_libraries m) endif() -if(_tiff_incomplete) +if(z_vcpkg_tiff_incomplete) set(TIFF_FOUND FALSE) else() if(TARGET TIFF::TIFF) - set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${_tiff_link_libraries}) + set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_tiff_link_libraries}) endif() if(TIFF_LIBRARIES) - list(APPEND TIFF_LIBRARIES ${_tiff_libraries}) + list(APPEND TIFF_LIBRARIES ${z_vcpkg_tiff_libraries}) endif() if(TIFF_LIBRARY) - list(APPEND TIFF_LIBRARY ${_tiff_libraries}) + list(APPEND TIFF_LIBRARY ${z_vcpkg_tiff_libraries}) endif() endif() -unset(_tiff_link_libraries) -unset(_tiff_libraries) -unset(_tiff_incomplete) -unset(_tiff_find_options) +unset(z_vcpkg_tiff_link_libraries) +unset(z_vcpkg_tiff_libraries) +unset(z_vcpkg_tiff_incomplete) +unset(z_vcpkg_tiff_find_options) cmake_policy(POP) From 06ee40fe4016e4f85067e9b792e5852448bb584f Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Sep 2021 11:03:13 +0200 Subject: [PATCH 09/12] Use more common conditional dependency configuration --- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 66 ++++++++----------------- 1 file changed, 20 insertions(+), 46 deletions(-) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 2d76854678ef85..a9d94f0a18b326 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -1,9 +1,6 @@ cmake_policy(PUSH) cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0057 NEW) -set(z_vcpkg_tiff_link_libraries "") -set(z_vcpkg_tiff_libraries "") -set(z_vcpkg_tiff_incomplete FALSE) set(z_vcpkg_tiff_find_options "") if("REQUIRED" IN_LIST ARGS) list(APPEND z_vcpkg_tiff_find_options "REQUIRED") @@ -11,36 +8,26 @@ endif() _find_package(${ARGS}) -if(@webp@) - find_package(WebP CONFIG ${z_vcpkg_tiff_find_options}) - if(WebP_FOUND) +if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") + set(z_vcpkg_tiff_link_libraries "") + set(z_vcpkg_tiff_libraries "") + if(@webp@) + find_package(WebP CONFIG ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries WebP::WebP) list(APPEND z_vcpkg_tiff_libraries ${WEBP_LIBRARIES}) - else() - set(z_vcpkg_tiff_incomplete TRUE) endif() -endif() -if(@lzma@) - find_package(LibLZMA CONFIG ${z_vcpkg_tiff_find_options}) - if(LibLZMA_FOUND) + if(@lzma@) + find_package(LibLZMA CONFIG ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries LibLZMA::LibLZMA) list(APPEND z_vcpkg_tiff_libraries ${LZMA_LIBRARIES}) - else() - set(z_vcpkg_tiff_incomplete TRUE) endif() -endif() -if(@jpeg@) - find_package(JPEG ${z_vcpkg_tiff_find_options}) - if(JPEG_FOUND) + if(@jpeg@) + find_package(JPEG ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries JPEG::JPEG) list(APPEND z_vcpkg_tiff_libraries ${JPEG_LIBRARIES}) - else() - set(z_vcpkg_tiff_incomplete TRUE) endif() -endif() -if(@zstd@) - find_package(ZSTD CONFIG ${z_vcpkg_tiff_find_options}) - if(ZSTD_FOUND) + if(@zstd@) + find_package(ZSTD CONFIG ${z_vcpkg_tiff_find_options}) if(TARGET zstd::libzstd_shared) set(z_vcpkg_tiff_zstd zstd::libzstd_shared) else() @@ -48,39 +35,26 @@ if(@zstd@) endif() list(APPEND z_vcpkg_tiff_link_libraries ${z_vcpkg_tiff_zstd}) list(APPEND z_vcpkg_tiff_libraries ${z_vcpkg_tiff_zstd}) - else() - set(z_vcpkg_tiff_incomplete TRUE) endif() -endif() -if(@zlib@) - find_package(ZLIB ${z_vcpkg_tiff_find_options}) - if(ZLIB_FOUND) + if(@zlib@) + find_package(ZLIB ${z_vcpkg_tiff_find_options}) list(APPEND z_vcpkg_tiff_link_libraries ZLIB::ZLIB) list(APPEND z_vcpkg_tiff_libraries ${ZLIB_LIBRARIES}) - else() - set(z_vcpkg_tiff_incomplete TRUE) endif() -endif() -if(UNIX) - list(APPEND z_vcpkg_tiff_link_libraries m) - list(APPEND z_vcpkg_tiff_libraries m) -endif() + if(UNIX) + list(APPEND z_vcpkg_tiff_link_libraries m) + list(APPEND z_vcpkg_tiff_libraries m) + endif() -if(z_vcpkg_tiff_incomplete) - set(TIFF_FOUND FALSE) -else() if(TARGET TIFF::TIFF) set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_tiff_link_libraries}) endif() - if(TIFF_LIBRARIES) - list(APPEND TIFF_LIBRARIES ${z_vcpkg_tiff_libraries}) - endif() + list(APPEND TIFF_LIBRARIES ${z_vcpkg_tiff_libraries}) if(TIFF_LIBRARY) list(APPEND TIFF_LIBRARY ${z_vcpkg_tiff_libraries}) endif() + unset(z_vcpkg_tiff_link_libraries) + unset(z_vcpkg_tiff_libraries) endif() -unset(z_vcpkg_tiff_link_libraries) -unset(z_vcpkg_tiff_libraries) -unset(z_vcpkg_tiff_incomplete) unset(z_vcpkg_tiff_find_options) cmake_policy(POP) From 7ae5af94018d71058286999a27e90bee5e72a678 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Sep 2021 11:06:28 +0200 Subject: [PATCH 10/12] Don't touch TIFF_LIBRARY --- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index a9d94f0a18b326..4e829921f85444 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -50,9 +50,6 @@ if(TIFF_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static") set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_tiff_link_libraries}) endif() list(APPEND TIFF_LIBRARIES ${z_vcpkg_tiff_libraries}) - if(TIFF_LIBRARY) - list(APPEND TIFF_LIBRARY ${z_vcpkg_tiff_libraries}) - endif() unset(z_vcpkg_tiff_link_libraries) unset(z_vcpkg_tiff_libraries) endif() From 6eebf40af56ff5438dd9405366ef8e2847b641cd Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Sep 2021 11:08:01 +0200 Subject: [PATCH 11/12] Pass on QUIET option --- ports/tiff/vcpkg-cmake-wrapper.cmake.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in index 4e829921f85444..b722944ea1dc9f 100644 --- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in +++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in @@ -5,6 +5,9 @@ set(z_vcpkg_tiff_find_options "") if("REQUIRED" IN_LIST ARGS) list(APPEND z_vcpkg_tiff_find_options "REQUIRED") endif() +if("QUIET" IN_LIST ARGS) + list(APPEND z_vcpkg_tiff_find_options "QUIET") +endif() _find_package(${ARGS}) From 9fd662f478d9531224fd46615115e7088ae9b7d3 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Sat, 18 Sep 2021 20:30:43 +0200 Subject: [PATCH 12/12] Update versions --- versions/t-/tiff.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/t-/tiff.json b/versions/t-/tiff.json index 5c84ed36aeac8f..29367b7306d910 100644 --- a/versions/t-/tiff.json +++ b/versions/t-/tiff.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "aab7feb7ca21fc2343fff20bf27d92a95d0b5e69", + "git-tree": "f147253c84ad1d911393d8b5496f30574a07c780", "version": "4.3.0", "port-version": 2 },