From 35545814586abcfcdb9ec4f4193c9ae216e12b2b Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 18 Jan 2022 22:42:39 +0100
Subject: [PATCH] [minhook] only windows (#22558)

---
 ports/minhook/portfile.cmake | 15 ++++++---------
 ports/minhook/vcpkg.json     | 16 +++++++++++++---
 scripts/ci.baseline.txt      |  5 -----
 versions/baseline.json       |  2 +-
 versions/m-/minhook.json     |  5 +++++
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/ports/minhook/portfile.cmake b/ports/minhook/portfile.cmake
index bd022d5bcb..8c95a4dcd9 100644
--- a/ports/minhook/portfile.cmake
+++ b/ports/minhook/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(ON_TARGET "UWP")
-
 if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
     set(BUILD_ARCH "Win32")
     set(OUTPUT_DIR "Win32")
@@ -29,15 +27,14 @@ vcpkg_from_github(
         fix-usage.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/minhook)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/minhook)
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/minhook/vcpkg.json b/ports/minhook/vcpkg.json
index 707945cccc..e2a0b7b777 100644
--- a/ports/minhook/vcpkg.json
+++ b/ports/minhook/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "minhook",
-  "version-string": "1.3.3",
-  "port-version": 2,
+  "version": "1.3.3",
+  "port-version": 3,
   "description": "The Minimalistic x86/x64 API Hooking Library for Windows.",
-  "supports": "!uwp"
+  "supports": "windows & !uwp & !arm",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 52f1583bbd..311ed041cc 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -810,11 +810,6 @@ mhook:x64-linux=fail
 mhook:x64-osx=fail
 mhook:x64-uwp=fail
 milerius-sfml-imgui:x64-windows-static=fail
-minhook:arm64-windows=fail
-minhook:arm-uwp=fail
-minhook:x64-linux=fail
-minhook:x64-osx=fail
-minhook:x64-uwp=fail
 minifb:arm-uwp=fail
 minifb:x64-uwp=fail
 minisat-master-keying:arm-uwp=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index dff21d7c31..a21acc94ce 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4406,7 +4406,7 @@
     },
     "minhook": {
       "baseline": "1.3.3",
-      "port-version": 2
+      "port-version": 3
     },
     "minifb": {
       "baseline": "2019-08-20",
diff --git a/versions/m-/minhook.json b/versions/m-/minhook.json
index 8e90429e48..6cab064681 100644
--- a/versions/m-/minhook.json
+++ b/versions/m-/minhook.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fea414bee13115e201fe93699ba5b55c7ae031b8",
+      "version": "1.3.3",
+      "port-version": 3
+    },
     {
       "git-tree": "8dbdd0ae999b8929af5e9df0cbae321bb0d71cea",
       "version-string": "1.3.3",