commit 75f608e5a2d41b980c005cb8d06cfc8b367e9fb3 Author: Uwe Klotz <uwe.klotz(a)gmail.com&gt; Date: Mon Jul 24 19:33:09 2023 +0200 Use system-provided google-benchmark library cmake-exclude-subdirectory-lib-benchmark.patch | 16 ++++++++++++++++ cmake-visibility.patch | 18 ------------------ mixxx.spec | 3 ++- 3 files changed, 18 insertions(+), 19 deletions(-) --- diff --git a/cmake-exclude-subdirectory-lib-benchmark.patch b/cmake-exclude-subdirectory-lib-benchmark.patch new file mode 100644 index 0000000..9d74033 --- /dev/null +++ b/cmake-exclude-subdirectory-lib-benchmark.patch @@ -0,0 +1,16 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1890,10 +1890,6 @@ set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE) + # Prevent installation of google/benchmark artifacts + set(BENCHMARK_ENABLE_INSTALL OFF CACHE BOOL "Disable installation of google/benchmark" FORCE) + +-add_subdirectory( +- "${CMAKE_CURRENT_SOURCE_DIR}/lib/benchmark" +- "${CMAKE_CURRENT_BINARY_DIR}/lib/benchmark" +-) + target_link_libraries(mixxx-test PRIVATE benchmark) + + # Test Suite +-- +2.41.0 + diff --git a/mixxx.spec b/mixxx.spec index b705435..9b3fbcd 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -37,7 +37,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{ # as a fragment identifier to the URL to populate SOURCE<n> correctly Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder... Source2: https://github.com/xsco/libdjinterop/archive/refs/tags/%{libdjinterop_ver... -Patch0: cmake-visibility.patch +Patch0: cmake-exclude-subdirectory-lib-benchmark.patch # Build Tools BuildRequires: desktop-file-utils @@ -47,6 +47,7 @@ BuildRequires: cmake BuildRequires: ccache BuildRequires: gcc-c++ BuildRequires: ninja-build +BuildRequires: google-benchmark-devel # Build Requirements BuildRequires: chrpath