From eb2079d467f8658eea13e2ed86cc69d864632866 Mon Sep 17 00:00:00 2001
From: Vinicius Monego <monego@posteo.net>
Date: Wed, 29 Sep 2021 19:07:35 -0300
Subject: [PATCH] Use system googletest and benchmark.

---
 CMakeLists.txt | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10e9b0a..492ccae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1467,12 +1467,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "Pass Mixxx compiler/linker options to
 # Prevent installation of GoogleTest libraries
 set(INSTALL_GTEST OFF CACHE BOOL "Disable installation of GoogleTest" FORCE)
 
-# Add googletest directly to our build. This adds the following targets:
-# gtest, gtest_main, gmock and gmock_main
-add_subdirectory(
-  "${CMAKE_CURRENT_SOURCE_DIR}/lib/googletest"
-  "${CMAKE_CURRENT_BINARY_DIR}/lib/googletest"
-)
+find_package(GTest CONFIG REQUIRED)
 
 add_executable(mixxx-test
   src/test/analyserwaveformtest.cpp
@@ -1582,10 +1577,8 @@ 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"
-)
+find_package(benchmark CONFIG REQUIRED)
+
 target_link_libraries(mixxx-test PRIVATE benchmark)
 
 # Test Suite
-- 
2.30.2

cm?id=df09535fc9cb49ea3a388bc63f18fdf03c590e49'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/cluster.scm'>
<input type='hidden' name='id' value='df09535fc9cb49ea3a388bc63f18fdf03c590e49'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=df09535fc9cb49ea3a388bc63f18fdf03c590e49'>root</a>/<a href='/guix/log/gnu?id=df09535fc9cb49ea3a388bc63f18fdf03c590e49'>gnu</a>/<a href='/guix/log/gnu/packages?id=df09535fc9cb49ea3a388bc63f18fdf03c590e49'>packages</a>/<a href='/guix/log/gnu/packages/cluster.scm?id=df09535fc9cb49ea3a388bc63f18fdf03c590e49'>cluster.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/cluster.scm?id=df09535fc9cb49ea3a388bc63f18fdf03c590e49&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-11-30 21:17:25 +0100'>2020-11-30</span></td><td><a href='/guix/commit/gnu/packages/cluster.scm?id=d74c82b24e10ee59a2484577e0e535f36c078a7f'>gnu: drbd-utils: Update to 9.15.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cluster.scm (drbd-utils): Update to 9.15.1.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-10-10 23:39:17 +0200'>2020-10-10</span></td><td><a href='/guix/commit/gnu/packages/cluster.scm?id=210b5282b03a4e5d56c9181b8ac5632a45846549'>gnu: drbd-utils: Update to 9.15.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cluster.scm (drbd-utils): Update to 9.15.0.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-07-02 23:20:51 +0200'>2020-07-02</span></td><td><a href='/guix/commit/gnu/packages/cluster.scm?id=415beccb1d43cc36e03041fe59642929dc3da1e4'>gnu: Add drbd-utils.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cluster.scm (drbd-utils): New variable.
</span></span></td><td>Marius Bakke</td></tr>