From 7dc9036ee1ec8e8b26c23668143086232dab362e Mon Sep 17 00:00:00 2001 From: rdobuilder Date: Feb 05 2025 17:20:55 +0000 Subject: Update to 1.9.1 Related-to: https://review.rdoproject.org/r/q/I4bb575b08314be8170d7331a6aafc6ce5ce93764 --- diff --git a/SOURCES/google-benchmark-docs-installation.patch b/SOURCES/google-benchmark-docs-installation.patch new file mode 100644 index 0000000..a8fb580 --- /dev/null +++ b/SOURCES/google-benchmark-docs-installation.patch @@ -0,0 +1,46 @@ +From 1bd8098d3d5b7aa8e305e57b2451ab8f98a58965 Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Wed, 8 Sep 2021 19:40:25 +0200 +Subject: [PATCH] Optimized docs installation (#1225) + +* Use GNUInstallDirs to install docs. + +Signed-off-by: Vitaly Zaitsev + +* Added an option to disable docs installation. + +Signed-off-by: Vitaly Zaitsev +--- + CMakeLists.txt | 1 + + src/CMakeLists.txt | 8 +++++--- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 49f2ae2a0..d32dbd83d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,6 +25,7 @@ else() + set(BENCHMARK_BUILD_32_BITS OFF CACHE BOOL "Build a 32 bit version of the library - unsupported when using MSVC)" FORCE) + endif() + option(BENCHMARK_ENABLE_INSTALL "Enable installation of benchmark. (Projects embedding benchmark may want to turn this OFF.)" ON) ++option(BENCHMARK_INSTALL_DOCS "Enable installation of documentation." ON) + + # Allow unmet dependencies to be met using CMake's ExternalProject mechanics, which + # may require downloading the source code. +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1df8a4aa8..19ff8857a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -118,7 +118,9 @@ if (BENCHMARK_ENABLE_INSTALL) + NAMESPACE "${namespace}" + DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") + +- install( +- DIRECTORY "${PROJECT_SOURCE_DIR}/docs/" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}") ++ if (BENCHMARK_INSTALL_DOCS) ++ install( ++ DIRECTORY "${PROJECT_SOURCE_DIR}/docs/" ++ DESTINATION "${CMAKE_INSTALL_DOCDIR}") ++ endif() + endif() diff --git a/SOURCES/google-benchmark-packaged-gtest.patch b/SOURCES/google-benchmark-packaged-gtest.patch new file mode 100644 index 0000000..63b4f4c --- /dev/null +++ b/SOURCES/google-benchmark-packaged-gtest.patch @@ -0,0 +1,31 @@ +From e8619813072f8eb7cf2d0e30b331c791405f5fef Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Wed, 8 Sep 2021 19:41:07 +0200 +Subject: [PATCH] Added support of packaged GTest for running unit tests. + +Signed-off-by: Vitaly Zaitsev +--- + CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 49f2ae2a0..0570d050d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -307,7 +307,15 @@ if (BENCHMARK_ENABLE_TESTING) + if (BENCHMARK_ENABLE_GTEST_TESTS AND + NOT (TARGET gtest AND TARGET gtest_main AND + TARGET gmock AND TARGET gmock_main)) +- include(GoogleTest) ++ find_package(GTest QUIET) ++ if (GTEST_FOUND) ++ add_library(gtest ALIAS GTest::gtest) ++ add_library(gtest_main ALIAS GTest::gtest_main) ++ add_library(gmock ALIAS GTest::gmock) ++ add_library(gmock_main ALIAS GTest::gmock_main) ++ else() ++ include(GoogleTest) ++ endif() + endif() + add_subdirectory(test) + endif()