Skip to content

Commit

Permalink
Upgrade Google Benchmark version from 1.6.0 to 1.7.1
Browse files Browse the repository at this point in the history
  • Loading branch information
cngzhnp committed Apr 24, 2023
1 parent a39e8b5 commit 3ed3243
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 27 deletions.
6 changes: 3 additions & 3 deletions bazel/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ def opentelemetry_cpp_deps():
maybe(
http_archive,
name = "com_github_google_benchmark",
sha256 = "1f71c72ce08d2c1310011ea6436b31e39ccab8c2db94186d26657d41747c85d6",
strip_prefix = "benchmark-1.6.0",
sha256 = "6430e4092653380d9dc4ccb45a1e2dc9259d581f4866dc0759713126056bc1d7",
strip_prefix = "benchmark-1.7.1",
urls = [
"https://github.com/google/benchmark/archive/v1.6.0.tar.gz",
"https://github.com/google/benchmark/archive/v1.7.1.tar.gz",
],
)

Expand Down
5 changes: 0 additions & 5 deletions ci/ports/benchmark/CONTROL

This file was deleted.

27 changes: 10 additions & 17 deletions ci/ports/benchmark/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,31 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
endif()

# Make sure vs2019 compiled binaries are compat with vs2017
set(VCPKG_CXX_FLAGS "/Zc:__cplusplus /d2FH4-")
set(VCPKG_C_FLAGS "/Zc:__cplusplus /d2FH4-")

include(vcpkg_common_functions)

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/benchmark
REF v1.5.0
SHA512 a0df9aa3d03f676e302c76d83b436de36eea0a8517ab50a8f5a11c74ccc68a1f5128fa02474901002d8e6b5a4d290ef0272a798ff4670eab3e2d78dc86bb6cd3
REF v1.7.1
SHA512 396af1c1d3eaa2b78c6d23b1472f6088db85a294056ae1c2366dc5c0becdc8f141ba8fc3a235033324ab0a41c2298f5d242ef09b9b6f69d9877de6bcb2062efd
HEAD_REF master
)

vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
-DBENCHMARK_ENABLE_TESTING=OFF
-DCMAKE_DEBUG_POSTFIX=d
)

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()

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(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/benchmark)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/benchmark/LICENSE ${CURRENT_PACKAGES_DIR}/share/benchmark/copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
19 changes: 19 additions & 0 deletions ci/ports/benchmark/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"$comment": "https://github.com/google/benchmark/issues/661 describes the missing UWP support upstream",
"name": "benchmark",
"version-semver": "1.7.1",
"description": "A library to support the benchmarking of functions, similar to unit-tests.",
"homepage": "https://github.com/google/benchmark",
"license": "Apache-2.0",
"supports": "!uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
2 changes: 1 addition & 1 deletion third_party/benchmark
Submodule benchmark updated 139 files
2 changes: 1 addition & 1 deletion third_party_release
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
gRPC=v1.49.2
thrift=0.14.1
abseil=20220623.1
benchmark=v1.5.3
benchmark=v1.7.1
googletest=release-1.12.1
ms-gsl=v3.1.0-67-g6f45293
nlohmann-json=v3.10.5
Expand Down

0 comments on commit 3ed3243

Please sign in to comment.