From f8dfd8509d0cf21530d44fa208e84623b89cd35c Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 16 Nov 2021 19:31:54 +0100
Subject: [PATCH] [memorymodule] use supports expression (#21450)

---
 ports/memorymodule/portfile.cmake | 28 +++++++++++++---------------
 ports/memorymodule/vcpkg.json     |  9 ++++++++-
 scripts/ci.baseline.txt           |  4 ----
 versions/baseline.json            |  2 +-
 versions/m-/memorymodule.json     |  5 +++++
 5 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/ports/memorymodule/portfile.cmake b/ports/memorymodule/portfile.cmake
index 7c772711d5..af5fade33a 100644
--- a/ports/memorymodule/portfile.cmake
+++ b/ports/memorymodule/portfile.cmake
@@ -1,5 +1,3 @@
-vcpkg_fail_port_install(ON_TARGET "Linux" "OSX" "UWP")
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fancycode/MemoryModule
@@ -12,34 +10,34 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_check_features(
     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    unicode UNICODE
+    FEATURES
+        unicode UNICODE
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DTESTSUITE=OFF
         ${FEATURE_OPTIONS}
 )
 
-vcpkg_build_cmake(TARGET MemoryModule)
+vcpkg_cmake_build(TARGET MemoryModule)
 
-file(INSTALL ${SOURCE_PATH}/MemoryModule.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(INSTALL "${SOURCE_PATH}/MemoryModule.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
 
-if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib)
+if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib")
     file(INSTALL
-        ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib
-        DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/MemoryModule.lib"
+        DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib"
     )
 endif()
 
-if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib)
+if(EXISTS "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib")
     file(INSTALL
-        ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib
-        DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+        "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/MemoryModule.lib"
+        DESTINATION "${CURRENT_PACKAGES_DIR}/lib"
     )
 endif()
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/memorymodule/vcpkg.json b/ports/memorymodule/vcpkg.json
index 3e5ca2f3a0..49b5726ad7 100644
--- a/ports/memorymodule/vcpkg.json
+++ b/ports/memorymodule/vcpkg.json
@@ -1,9 +1,16 @@
 {
   "name": "memorymodule",
   "version-string": "2019-12-31",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Library to load a DLL from memory",
   "homepage": "https://github.com/fancycode/MemoryModule",
+  "supports": "!linux & !osx & !uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
   "default-features": [
     "unicode"
   ],
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index dca83344c7..c45282e392 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -835,10 +835,6 @@ mecab:x64-windows        = skip
 mecab:x64-windows-static = skip
 mecab:x64-windows-static-md=skip
 mecab:x86-windows        = skip
-memorymodule:arm-uwp=fail
-memorymodule:x64-linux=fail
-memorymodule:x64-osx=fail
-memorymodule:x64-uwp=fail
 # Due to static crt.
 mesa:x64-windows-static=fail
 mesa:x64-windows-static-md=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index ce183d866c..a2e6668647 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4306,7 +4306,7 @@
     },
     "memorymodule": {
       "baseline": "2019-12-31",
-      "port-version": 1
+      "port-version": 2
     },
     "mesa": {
       "baseline": "21.2.0",
diff --git a/versions/m-/memorymodule.json b/versions/m-/memorymodule.json
index 45da1309cb..990365470d 100644
--- a/versions/m-/memorymodule.json
+++ b/versions/m-/memorymodule.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f7818f51e182a651a0b090ea0d315c32b928d7c3",
+      "version-string": "2019-12-31",
+      "port-version": 2
+    },
     {
       "git-tree": "55a786b4bc6d55f353749c06afa40b809ff8c9c4",
       "version-string": "2019-12-31",