[tiff] Fix find_package in cmake wrapper (#18473)

* Revise tiff cmake wrapper

* x-add-version

* Use variables from vcpkg_check_features

* x-add-version

* Set CMP0012 to allow 'if(ON)'

* x-add-version

* Restore early call to _find_package

* Move wrapper vars to z_vcpkg namespace

* Use more common conditional dependency configuration

* Don't touch TIFF_LIBRARY

* Pass on QUIET option

* Update versions

4 files changed, 62 insertions, 46 deletions

diff --git a/ports/tiff/vcpkg-cmake-wrapper.cmake.in b/ports/tiff/vcpkg-cmake-wrapper.cmake.in
index cd356483a..b722944ea 100644
--- a/ports/tiff/vcpkg-cmake-wrapper.cmake.in
+++ b/ports/tiff/vcpkg-cmake-wrapper.cmake.in
@@ -1,49 +1,60 @@
-_find_package(${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})
+cmake_policy(PUSH)
+cmake_policy(SET CMP0012 NEW)
+cmake_policy(SET CMP0057 NEW)
+set(z_vcpkg_tiff_find_options "")
+if("REQUIRED" IN_LIST ARGS)
+    list(APPEND z_vcpkg_tiff_find_options "REQUIRED")
 endif()
-if(_tiff_features MATCHES ";jpeg;")
-    find_package(JPEG REQUIRED)
-    list(APPEND _tiff_link_libraries JPEG::JPEG)
-    list(APPEND _tiff_libraries ${JPEG_LIBRARIES})
+if("QUIET" IN_LIST ARGS)
+    list(APPEND z_vcpkg_tiff_find_options "QUIET")
 endif()
-if(_tiff_features MATCHES ";zstd;")
-    find_package(ZSTD CONFIG REQUIRED)
-    if(TARGET zstd::libzstd_shared)
-        set(_tiff_zstd zstd::libzstd_shared)
-    else()
-        set(_tiff_zstd zstd::libzstd_static)
+
+_find_package(${ARGS})
+
+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})
+    endif()
+    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})
+    endif()
+    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})
+    endif()
+    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()
+            set(z_vcpkg_tiff_zstd zstd::libzstd_static)
+        endif()
+        list(APPEND z_vcpkg_tiff_link_libraries ${z_vcpkg_tiff_zstd})
+        list(APPEND z_vcpkg_tiff_libraries ${z_vcpkg_tiff_zstd})
+    endif()
+    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})
+    endif()
+    if(UNIX)
+        list(APPEND z_vcpkg_tiff_link_libraries m)
+        list(APPEND z_vcpkg_tiff_libraries m)
     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})
-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(TARGET TIFF::TIFF)
+        set_property(TARGET TIFF::TIFF APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${z_vcpkg_tiff_link_libraries})
+    endif()
+    list(APPEND TIFF_LIBRARIES ${z_vcpkg_tiff_libraries})
+    unset(z_vcpkg_tiff_link_libraries)
+    unset(z_vcpkg_tiff_libraries)
 endif()
+unset(z_vcpkg_tiff_find_options)
+cmake_policy(POP)
diff --git a/ports/tiff/vcpkg.json b/ports/tiff/vcpkg.json
index f31b99cdc..764fcf55d 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": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 8f8869151..d759b6c87 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6590,7 +6590,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 fb7ecc60d..29367b730 100644
--- a/versions/t-/tiff.json
+++ b/versions/t-/tiff.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "f147253c84ad1d911393d8b5496f30574a07c780",
+      "version": "4.3.0",
+      "port-version": 2
+    },
+    {
       "git-tree": "c8d1b0803b30c4fd2ea762d62b8d43cd09ff40f0",
       "version": "4.3.0",
       "port-version": 1