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=d42a0f10e750905adf49bc03cde8c20e59636afd'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/cedille.scm'>
<input type='hidden' name='id' value='d42a0f10e750905adf49bc03cde8c20e59636afd'/><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=d42a0f10e750905adf49bc03cde8c20e59636afd'>root</a>/<a href='/guix/log/gnu?id=d42a0f10e750905adf49bc03cde8c20e59636afd'>gnu</a>/<a href='/guix/log/gnu/packages?id=d42a0f10e750905adf49bc03cde8c20e59636afd'>packages</a>/<a href='/guix/log/gnu/packages/cedille.scm?id=d42a0f10e750905adf49bc03cde8c20e59636afd'>cedille.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/cedille.scm?id=d42a0f10e750905adf49bc03cde8c20e59636afd&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-04-02 20:55:14 +0200'>2020-04-02</span></td><td><a href='/guix/commit/gnu/packages/cedille.scm?id=be41d7d91df123a454e871190f1bb2711409bfa8'>gnu: cedille: Install the info pages.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cedille.scm (cedille)[arguments]: Rename phase
'patch-cedille-path-el' to 'patch-cedille-paths' and add substitution for the
info page location.   In the 'copy-cedille-mode' phase, install the info page.

Signed-off-by: Marius Bakke &lt;mbakke@fastmail.com&gt;
</span></span></td><td>John Soo</td></tr>
<tr><td><span title='2020-04-02 20:55:14 +0200'>2020-04-02</span></td><td><a href='/guix/commit/gnu/packages/cedille.scm?id=a8f1b52017820c87b9bb38abb42b48d8059688d3'>gnu: cedille: Fix emacs outputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cedille.scm (cedille):[arguments] Add slashes to output paths.

Signed-off-by: Marius Bakke &lt;mbakke@fastmail.com&gt;
</span></span></td><td>John Soo</td></tr>
<tr><td><span title='2020-03-19 12:07:10 -0400'>2020-03-19</span></td><td><a href='/guix/commit/gnu/packages/cedille.scm?id=0a3ce07784c74ff27b864884499deca41c3d4d0e'>gnu: cedille: Remove guix.d from the Elisp installation directory.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cedille.scm (cedille)[phases]{patch-cedille-path-el}: Update
the Elisp installation prefix used.
{copy-cedille-mode}: Likewise.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-02-23 19:01:22 +0100'>2020-02-23</span></td><td><a href='/guix/commit/gnu/packages/cedille.scm?id=1063dea4ff8a5106b51de8d6de7e23753403c81e'>gnu: cedille: Update to 1.1.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/cedille.scm (cedille): Update to 1.1.2.

Signed-off-by: Tobias Geerinckx-Rice &lt;me@tobias.gr&gt;
</span></span></td><td>John Soo</td></tr>