Upgrade Google Benchmark to latest v1.5.3 in git submodule and for CM…

…ake-vcpkg build on Windows (#748)
open-telemetry · May 20, 2021 · 227d400 · 227d400
1 parent b706993
commit 227d400
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 10 deletions.
diff --git a/third_party/benchmark b/third_party/benchmark
diff --git a/tools/ports/benchmark/CONTROL b/tools/ports/benchmark/CONTROL
@@ -1,5 +1,5 @@
 Source: benchmark
-Version: 1.5.1
+Version: 1.5.3
 Homepage: https://github.com/google/benchmark
 Description: A library to support the benchmarking of functions, similar to unit-tests.
-Supports: !uwp
+Supports: !(arm|uwp)
diff --git a/tools/ports/benchmark/portfile.cmake b/tools/ports/benchmark/portfile.cmake
@@ -1,7 +1,3 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-  message(FATAL_ERROR "${PORT} does not currently support UWP")
-endif()
-
 if (VCPKG_PLATFORM_TOOLSET STREQUAL "v140")
   # set(CMAKE_C_COMPILER_WORKS 1)
   # set(CMAKE_CXX_COMPILER_WORKS 1)
@@ -17,14 +13,18 @@ else()
   set(PREFER PREFER_NINJA)
 endif()
 
-include(vcpkg_common_functions)
+#https://github.com/google/benchmark/issues/661
+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 c05843a9f622db08ad59804c190f98879b76beba # v1.5.3
+    SHA512 1
     HEAD_REF master
+    PATCHES "version.patch"
 )
 
 vcpkg_configure_cmake(
@@ -41,9 +41,10 @@ vcpkg_copy_pdbs()
 
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/benchmark)
 
+vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread)
+
 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)
diff --git a/tools/ports/benchmark/version.patch b/tools/ports/benchmark/version.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1007254..47e4a1b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -78,8 +78,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+
+
+ # Read the git tags to determine the project version
+-include(GetGitVersion)
+-get_git_version(GIT_VERSION)
++# include(GetGitVersion)
++# get_git_version(GIT_VERSION)
++set(GIT_VERSION 1.5.3)
+
+ # Tell the user what versions we are using
+ string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 35d559e..e9dec6d 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -77,9 +77,13 @@ set(targets_export_name "${PROJECT_NAME}Targets")
+ set(namespace "${PROJECT_NAME}::")
+
+ include(CMakePackageConfigHelpers)
++# Avoid architecture compatibility check
++set(DOCTEST_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
++unset(CMAKE_SIZEOF_VOID_P)
+ write_basic_package_version_file(
+   "${version_config}" VERSION ${GENERIC_LIB_VERSION} COMPATIBILITY SameMajorVersion
+ )
++set(CMAKE_SIZEOF_VOID_P ${DOCTEST_SIZEOF_VOID_P})
+
+ configure_file("${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in" "${project_config}" @ONLY)
+ configure_file("${PROJECT_SOURCE_DIR}/cmake/benchmark.pc.in" "${pkg_config}" @ONLY)
+30 −0		.github/workflows/bazel.yml
+2 −0		AUTHORS
+1 −0		CMakeLists.txt
+5 −0		CONTRIBUTORS
+28 −4		README.md
+15 −0		WORKSPACE
+3 −1		bindings/python/google_benchmark/__init__.py
+2 −1		bindings/python/google_benchmark/benchmark.cc
+2 −2		cmake/benchmark.pc.in
+0 −7		conan/CMakeLists.txt
+0 −10		conan/test_package/CMakeLists.txt
+0 −19		conan/test_package/conanfile.py
+0 −18		conan/test_package/test_package.cpp
+0 −79		conanfile.py
+35 −14		include/benchmark/benchmark.h
+2 −0		requirements.txt
+1 −1		src/benchmark.cc
+5 −0		src/benchmark_register.cc
+2 −1		src/benchmark_register.h
+5 −3		src/benchmark_runner.cc
+18 −3		src/cycleclock.h
+9 −1		src/internal_macros.h
+16 −0		src/sleep.cc
+24 −10		src/sysinfo.cc
+12 −3		src/timers.cc
+18 −3		test/basic_test.cc
+6 −0		test/benchmark_gtest.cc
+8 −6		test/fixture_test.cc
+1 −0		test/options_test.cc
+5 −0		test/output_test_helper.cc
+112 −1		test/reporter_output_test.cc
+19 −0		tools/BUILD.bazel
+16 −3		tools/compare.py
+491 −129		tools/gbench/report.py