From b3755cb89fbd7f0740c5d79e4d9fe8a4ade367f1 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 24 Jan 2022 13:33:27 -0800 Subject: [PATCH] [benchmark] Remove vcpkg_fail_port_install. (#22728) A comment was moved from portfile.cmake to vcpkg.json. In support of https://github.com/microsoft/vcpkg/pull/21502 --- ports/benchmark/portfile.cmake | 3 --- ports/benchmark/vcpkg.json | 2 ++ versions/b-/benchmark.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index f1b79a6ca7..a5cf1ea0ad 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -1,6 +1,3 @@ -#https://github.com/google/benchmark/issues/661 -vcpkg_fail_port_install(ON_TARGET "uwp") - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json index 713f0fa316..833ba8759d 100644 --- a/ports/benchmark/vcpkg.json +++ b/ports/benchmark/vcpkg.json @@ -1,6 +1,8 @@ { + "$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream", "name": "benchmark", "version-semver": "1.6.0", + "port-version": 1, "description": "A library to support the benchmarking of functions, similar to unit-tests.", "homepage": "https://github.com/google/benchmark", "supports": "!uwp", diff --git a/versions/b-/benchmark.json b/versions/b-/benchmark.json index 8832810570..d75a984b84 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7856168d2b0dcaf058c077798ca47f767c6444f5", + "version-semver": "1.6.0", + "port-version": 1 + }, { "git-tree": "4a77547715562fcaa95568226f79af88d859d2c1", "version-semver": "1.6.0", diff --git a/versions/baseline.json b/versions/baseline.json index b545a60adb..e80e745ec5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -418,7 +418,7 @@ }, "benchmark": { "baseline": "1.6.0", - "port-version": 0 + "port-version": 1 }, "bento4": { "baseline": "1.5.1",