From 3566b81c04d0d2d58507fe04609c438d7a938a8a Mon Sep 17 00:00:00 2001
From: chausner <15180557+chausner@users.noreply.github.com>
Date: Wed, 29 Sep 2021 17:38:00 +0200
Subject: [indicators] Update to 2.2 (#20398)

* Update indicators to 2.2

* Update CI baseline

Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/indicators/portfile.cmake | 21 +++++++++++----------
 ports/indicators/vcpkg.json     | 14 ++++++++++++--
 versions/baseline.json          |  2 +-
 versions/i-/indicators.json     |  5 +++++
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/ports/indicators/portfile.cmake b/ports/indicators/portfile.cmake
index c4a49c0cc..4a71032b7 100644
--- a/ports/indicators/portfile.cmake
+++ b/ports/indicators/portfile.cmake
@@ -3,25 +3,26 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO p-ranav/indicators
-    REF b85eadb47c1d0f0edbb4da9c3b6384ec6486b24a # v2.0
-    SHA512 e9674440fa8643284a593b9e93345dc849301f42fe644b485e5dad1e12a20ef6687a2bf1eaeb2aec542d74544b7193c9b76b0166d7570781bc11604c71e8132a
+    REF v2.2
+    SHA512 7CED2D3C320D51C7E0569104744730C8E2F952350BCAE214A9781EB43EF4002C8314937DB78461351741FC4C3AEE7A1364582B1274991E95EB30006A5F2A7EF9
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DINDICATORS_BUILD_TESTS=OFF
         -DINDICATORS_SAMPLES=OFF
         -DINDICATORS_DEMO=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/indicators)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/indicators)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.termcolor" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/LICENSE.termcolor DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/indicators/vcpkg.json b/ports/indicators/vcpkg.json
index 5cca6d4b3..80bf1bb01 100644
--- a/ports/indicators/vcpkg.json
+++ b/ports/indicators/vcpkg.json
@@ -1,6 +1,16 @@
 {
   "name": "indicators",
-  "version": "2.0",
+  "version": "2.2",
   "description": "Activity indicators for modern C++",
-  "homepage": "https://github.com/p-ranav/indicators"
+  "homepage": "https://github.com/p-ranav/indicators",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index c4d9cef9f..ec4d98a18 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2793,7 +2793,7 @@
       "port-version": 0
     },
     "indicators": {
-      "baseline": "2.0",
+      "baseline": "2.2",
       "port-version": 0
     },
     "influxdb-cxx": {
diff --git a/versions/i-/indicators.json b/versions/i-/indicators.json
index b30cb7a4e..014ea5458 100644
--- a/versions/i-/indicators.json
+++ b/versions/i-/indicators.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1f6f4a44b4af9900116de9bd567e78372d3f7278",
+      "version": "2.2",
+      "port-version": 0
+    },
     {
       "git-tree": "d3271abb0e661db9fa81a346851c0caaa540ade6",
       "version": "2.0",
-- 
cgit v1.2.3