From 7bb4b663f1d2964b00f60d42ef05d5fe208a5a77 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Mon, 7 Mar 2022 20:11:41 +0100
Subject: [PATCH] [ampl-asl] Add supports expression (#23403)

---
 ports/ampl-asl/portfile.cmake | 13 ++++++-------
 ports/ampl-asl/vcpkg.json     | 17 ++++++++++++++---
 versions/a-/ampl-asl.json     |  5 +++++
 versions/baseline.json        |  2 +-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ports/ampl-asl/portfile.cmake b/ports/ampl-asl/portfile.cmake
index 6a8c55f80c3ede..fb6c664ca44fbf 100644
--- a/ports/ampl-asl/portfile.cmake
+++ b/ports/ampl-asl/portfile.cmake
@@ -13,9 +13,8 @@ vcpkg_from_github(
         install-targets.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_MCMODELLARGE=OFF
         -DBUILD_DYNRT_LIBS=OFF # CRT linkage uses C/CXX FLAGS in vcpkg
@@ -23,13 +22,13 @@ vcpkg_configure_cmake(
         -DBUILD_CPP=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-asl TARGET_PATH share/unofficial-asl)
+vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-asl)
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # from ampl-mp license
-file(INSTALL ${CURRENT_PORT_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL "${CURRENT_PORT_DIR}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/ampl-asl/vcpkg.json b/ports/ampl-asl/vcpkg.json
index f8acf57e2547a5..4b5c163b292b61 100644
--- a/ports/ampl-asl/vcpkg.json
+++ b/ports/ampl-asl/vcpkg.json
@@ -1,8 +1,19 @@
 {
   "name": "ampl-asl",
-  "version-string": "2020-11-11",
-  "port-version": 2,
+  "version-date": "2020-11-11",
+  "port-version": 3,
   "description": "AMPL Solver Library",
   "homepage": "https://github.com/ampl/asl",
-  "supports": "!uwp"
+  "license": null,
+  "supports": "!uwp & !(osx & arm64)",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/a-/ampl-asl.json b/versions/a-/ampl-asl.json
index aad10ec2833a7a..02f6ff768cd0f3 100644
--- a/versions/a-/ampl-asl.json
+++ b/versions/a-/ampl-asl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2a88fb5c85a975bf5c5b49b6d87224b25504553d",
+      "version-date": "2020-11-11",
+      "port-version": 3
+    },
     {
       "git-tree": "024e7d3399beb537eb371c85181e48f4db51a4b0",
       "version-string": "2020-11-11",
diff --git a/versions/baseline.json b/versions/baseline.json
index ca9e7cb7aead9b..693555e3d7b36d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -66,7 +66,7 @@
     },
     "ampl-asl": {
       "baseline": "2020-11-11",
-      "port-version": 2
+      "port-version": 3
     },
     "ampl-mp": {
       "baseline": "2020-11-11",