From 26840a632421d5ba04fe452f8772fdfead0ad9c2 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Thu, 24 Jun 2021 22:05:24 +0200 Subject: [PATCH] [benchmark] Update to 1.5.5 (#18595) * update benchmark * version stuff --- ports/benchmark/CONTROL | 5 ----- ports/benchmark/portfile.cmake | 12 ++++++------ ports/benchmark/vcpkg.json | 7 +++++++ versions/b-/benchmark.json | 5 +++++ versions/baseline.json | 2 +- 5 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 ports/benchmark/CONTROL create mode 100644 ports/benchmark/vcpkg.json diff --git a/ports/benchmark/CONTROL b/ports/benchmark/CONTROL deleted file mode 100644 index 9a7618385495b8..00000000000000 --- a/ports/benchmark/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: benchmark -Version: 1.5.2 -Homepage: https://github.com/google/benchmark -Description: A library to support the benchmarking of functions, similar to unit-tests. -Supports: !(arm|uwp) diff --git a/ports/benchmark/portfile.cmake b/ports/benchmark/portfile.cmake index 7f4add94ce7d3f..096641a5785a9e 100644 --- a/ports/benchmark/portfile.cmake +++ b/ports/benchmark/portfile.cmake @@ -6,8 +6,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO google/benchmark - REF 73d4d5e8d6d449fc8663765a42aa8aeeee844489 # v1.5.2 - SHA512 b87a7c207eb85187165df8ff99ab1bbf5d38fc2a6d839e267a71987951c94e33b55fd7fbee6f2b59202b0379a7e9705b73b193edaea0b9c742eddf3fcbe5f48e + REF e991355c02b93fe17713efe04cbc2e278e00fdbd # v1.5.5 + SHA512 aa4455fa0f8546ec5762f14065e0be6667b5874e6991ca6dd21dc7b29e38c7c74cfddb2c99c7a1ed2f7636aa7bdec8fc0fc1523967b179f5642c2dc2e968089c HEAD_REF master ) @@ -24,10 +24,10 @@ vcpkg_copy_pdbs() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark) -vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread) +vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +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) \ No newline at end of file diff --git a/ports/benchmark/vcpkg.json b/ports/benchmark/vcpkg.json new file mode 100644 index 00000000000000..bc666955193d94 --- /dev/null +++ b/ports/benchmark/vcpkg.json @@ -0,0 +1,7 @@ +{ + "name": "benchmark", + "version-semver": "1.5.5", + "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 b50f650ab65720..0edc1ab45cf6a3 100644 --- a/versions/b-/benchmark.json +++ b/versions/b-/benchmark.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e47bb1810fa9570b6b87eba79bb95c749763e1e0", + "version-semver": "1.5.5", + "port-version": 0 + }, { "git-tree": "9edadb1ffe2869bf6c1b2271e89576e05234e9a5", "version-string": "1.5.2", diff --git a/versions/baseline.json b/versions/baseline.json index 036d9aa3872058..4484b505b609dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -329,7 +329,7 @@ "port-version": 0 }, "benchmark": { - "baseline": "1.5.2", + "baseline": "1.5.5", "port-version": 0 }, "bento4": {