From 23cfcb4cd02d01bd0ba9a1630bb9bb3a02c95879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Thu, 23 Sep 2021 19:41:52 +0200
Subject: [benchmark] Update port to v1.6.0 (#20302)

Also replaced deprecated helpers with their new versions.
---
 ports/benchmark/portfile.cmake | 16 +++++++---------
 ports/benchmark/vcpkg.json     | 14 ++++++++++++--
 versions/b-/benchmark.json     |  5 +++++
 versions/baseline.json         |  2 +-
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake
index 096641a57..f1b79a6ca 100644
--- a/ports/benchmark/portfile.cmake
+++ b/ports/benchmark/portfile.cmake
@@ -1,28 +1,26 @@
 #https://github.com/google/benchmark/issues/661
-vcpkg_fail_port_install(ON_TARGET "uwp") 
+vcpkg_fail_port_install(ON_TARGET "uwp")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO google/benchmark
-    REF e991355c02b93fe17713efe04cbc2e278e00fdbd # v1.5.5
-    SHA512 aa4455fa0f8546ec5762f14065e0be6667b5874e6991ca6dd21dc7b29e38c7c74cfddb2c99c7a1ed2f7636aa7bdec8fc0fc1523967b179f5642c2dc2e968089c
+    REF f91b6b42b1b9854772a90ae9501464a161707d1e # v1.6.0
+    SHA512 5e3db75fcaa86b766d33e368f58cec5c5b2b9ba7fde658d13868d577679c13069756e68e86323b972daccc4f7d5e392d24d2d42e5308c1ae7e9955e651d45866
     HEAD_REF master
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
         -DBENCHMARK_ENABLE_TESTING=OFF
 )
 
-vcpkg_install_cmake()
-
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/benchmark)
 
 vcpkg_fixup_pkgconfig()
 
@@ -30,4 +28,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # Handle copyright
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json
index bc6669551..713f0fa31 100644
--- a/ports/benchmark/vcpkg.json
+++ b/ports/benchmark/vcpkg.json
@@ -1,7 +1,17 @@
 {
   "name": "benchmark",
-  "version-semver": "1.5.5",
+  "version-semver": "1.6.0",
   "description": "A library to support the benchmarking of functions, similar to unit-tests.",
   "homepage": "https://github.com/google/benchmark",
-  "supports": "!uwp"
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }
diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json
index 0edc1ab45..883281057 100644
--- a/versions/b-/benchmark.json
+++ b/versions/b-/benchmark.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4a77547715562fcaa95568226f79af88d859d2c1",
+      "version-semver": "1.6.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e47bb1810fa9570b6b87eba79bb95c749763e1e0",
       "version-semver": "1.5.5",
diff --git a/versions/baseline.json b/versions/baseline.json
index c977d55ca..542a1f28a 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -409,7 +409,7 @@
       "port-version": 1
     },
     "benchmark": {
-      "baseline": "1.5.5",
+      "baseline": "1.6.0",
       "port-version": 0
     },
     "bento4": {
-- 
cgit v1.2.3