From f978be65342f21f08e066c97d036bc1b3634810c Mon Sep 17 00:00:00 2001
From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Date: Wed, 13 Oct 2021 08:09:17 +0800
Subject: [ryml] Support osx (#20661)

* [ryml] Support osx

* Update deprecated functions

* Remove supports field
---
 ports/ryml/portfile.cmake | 23 ++++++++---------------
 ports/ryml/vcpkg.json     | 10 +++++++++-
 scripts/ci.baseline.txt   |  1 -
 versions/baseline.json    |  2 +-
 versions/r-/ryml.json     |  5 +++++
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/ports/ryml/portfile.cmake b/ports/ryml/portfile.cmake
index f3e2bf5c2..152c7c9e8 100644
--- a/ports/ryml/portfile.cmake
+++ b/ports/ryml/portfile.cmake
@@ -1,9 +1,5 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-vcpkg_fail_port_install(
-    ON_TARGET "OSX"
-)
-
 # Get rapidyaml src
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
@@ -38,21 +34,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         dbg           RYML_DBG
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         ${FEATURE_OPTIONS}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 vcpkg_copy_pdbs()
 
-if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
-elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/ryml)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/ryml)
+if(EXISTS "${CURRENT_PACKAGES_DIR}/cmake")
+    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
+elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/ryml")
+    vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/ryml)
 endif()
 
 # Move headers and natvis to own dir
@@ -72,6 +67,4 @@ file(WRITE "${CURRENT_PACKAGES_DIR}/share/ryml/rymlConfig.cmake" "${_contents}")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-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)
\ No newline at end of file
diff --git a/ports/ryml/vcpkg.json b/ports/ryml/vcpkg.json
index 01ec79dea..a11054bd4 100644
--- a/ports/ryml/vcpkg.json
+++ b/ports/ryml/vcpkg.json
@@ -1,13 +1,21 @@
 {
   "name": "ryml",
   "version-date": "2021-07-24",
+  "port-version": 1,
   "description": "Rapid YAML library",
   "homepage": "https://github.com/biojppm/rapidyaml",
-  "supports": "!osx",
   "dependencies": [
     {
       "name": "c4core",
       "default-features": false
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
     }
   ],
   "default-features": [
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 8a4765fec..6fe14819e 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1359,7 +1359,6 @@ rtlsdr:x64-linux=fail
 rtlsdr:x64-osx=fail
 rttr:arm-uwp=fail
 rttr:x64-uwp=fail
-ryml:x64-osx=fail
 ryu:arm-uwp=fail
 ryu:x64-uwp=fail
 ryu:x64-windows-static=fail
diff --git a/versions/baseline.json b/versions/baseline.json
index 5ff90bde9..f0d042d2f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5970,7 +5970,7 @@
     },
     "ryml": {
       "baseline": "2021-07-24",
-      "port-version": 0
+      "port-version": 1
     },
     "ryu": {
       "baseline": "2.0",
diff --git a/versions/r-/ryml.json b/versions/r-/ryml.json
index f977ffb5c..13c188a17 100644
--- a/versions/r-/ryml.json
+++ b/versions/r-/ryml.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "599ab36a18b1a0c439fdc6dc740bf0575a06641e",
+      "version-date": "2021-07-24",
+      "port-version": 1
+    },
     {
       "git-tree": "d97344132c58ae2aafb8c0ed1f23acde843404b5",
       "version-date": "2021-07-24",
-- 
cgit v1.2.3