From 66765fd0f27756ae832b8a7fd2ce0700a1682251 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Wed, 19 Jan 2022 00:47:52 +0100 Subject: [PATCH] [mhook] only windows (#22559) --- ports/mhook/portfile.cmake | 15 +++++++-------- ports/mhook/vcpkg.json | 13 ++++++++++--- scripts/ci.baseline.txt | 5 ----- versions/baseline.json | 2 +- versions/m-/mhook.json | 5 +++++ 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/ports/mhook/portfile.cmake b/ports/mhook/portfile.cmake index 51b47c3160..f89536f73d 100644 --- a/ports/mhook/portfile.cmake +++ b/ports/mhook/portfile.cmake @@ -7,14 +7,13 @@ vcpkg_from_github( PATCHES fix-windows-packing-mismatch.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() - -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mhook RENAME copyright) - +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/mhook" RENAME copyright) + diff --git a/ports/mhook/vcpkg.json b/ports/mhook/vcpkg.json index 8c55068ce6..13dc895dd7 100644 --- a/ports/mhook/vcpkg.json +++ b/ports/mhook/vcpkg.json @@ -1,6 +1,13 @@ { "name": "mhook", - "version-string": "2.5.1", - "port-version": 2, - "description": "A Windows API hooking library." + "version": "2.5.1", + "port-version": 3, + "description": "A Windows API hooking library.", + "supports": "windows & !uwp & !arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 36794d07a3..ac5d73c169 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -804,11 +804,6 @@ metis:arm-uwp=fail metis:x64-uwp=fail mfl:x64-linux=skip mfl:x64-osx=skip -mhook:arm64-windows=fail -mhook:arm-uwp=fail -mhook:x64-linux=fail -mhook:x64-osx=fail -mhook:x64-uwp=fail milerius-sfml-imgui:x64-windows-static=fail minifb:arm-uwp=fail minifb:x64-uwp=fail diff --git a/versions/baseline.json b/versions/baseline.json index 7c1cc5f13a..833fa25ebe 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4382,7 +4382,7 @@ }, "mhook": { "baseline": "2.5.1", - "port-version": 2 + "port-version": 3 }, "microsoft-signalr": { "baseline": "0.1.0-alpha3", diff --git a/versions/m-/mhook.json b/versions/m-/mhook.json index f2e9587c39..40c74d9b36 100644 --- a/versions/m-/mhook.json +++ b/versions/m-/mhook.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f4f5f56588f1c2b391e6c8766a4fa4dd713514d", + "version": "2.5.1", + "port-version": 3 + }, { "git-tree": "63acd5f7a94d6b86d9fb2b3642e0fbd253f21e47", "version-string": "2.5.1",