From 8f03ca270d1aa5dcafa945c941cf52ff14cb47da Mon Sep 17 00:00:00 2001
Message-Id: <8f03ca270d1aa5dcafa945c941cf52ff14cb47da.1682600200.git.dev@jpoiret.xyz>
From: Josselin Poiret <dev@jpoiret.xyz>
Date: Thu, 27 Apr 2023 14:51:51 +0200
Subject: [PATCH] Use provided catch2

From: Josselin Poiret <dev@jpoiret.xyz>

---
 CMakeLists.txt | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddab64e..2d5eac8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,6 @@ project(tl-expected
 include(CMakePackageConfigHelpers)
 include(CMakeDependentOption)
 include(GNUInstallDirs)
-include(FetchContent)
 include(CTest)
 
 if (NOT DEFINED CMAKE_CXX_STANDARD)
@@ -63,14 +62,7 @@ install(FILES
 install(DIRECTORY "include/" TYPE INCLUDE)
 
 if(EXPECTED_BUILD_TESTS)
-  set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
-  set(CATCH_INSTALL_HELPERS OFF)
-  set(CATCH_BUILD_TESTING OFF)
-  set(CATCH_INSTALL_DOCS OFF)
-  FetchContent_Declare(Catch2 URL
-    https://github.com/catchorg/Catch2/archive/v2.13.10.zip) 
-  FetchContent_MakeAvailable(Catch2)
-
+  find_package(Catch2 CONFIG)
   file(GLOB test-sources CONFIGURE_DEPENDS tests/*.cpp)
   list(FILTER test-sources EXCLUDE REGEX "tests/test.cpp")
   add_executable(${PROJECT_NAME}-tests "${test-sources}")
-- 
2.39.2

rvices/nix.scm?id=8a3b574b9c7ae6806247aefb22e6597c0ea4a8b7'>commit</a><a href='/guix/diff/gnu/services/nix.scm?id=8a3b574b9c7ae6806247aefb22e6597c0ea4a8b7'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/nix.scm'>
<input type='hidden' name='id' value='8a3b574b9c7ae6806247aefb22e6597c0ea4a8b7'/><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=8a3b574b9c7ae6806247aefb22e6597c0ea4a8b7'>root</a>/<a href='/guix/log/gnu?id=8a3b574b9c7ae6806247aefb22e6597c0ea4a8b7'>gnu</a>/<a href='/guix/log/gnu/services?id=8a3b574b9c7ae6806247aefb22e6597c0ea4a8b7'>services</a>/<a href='/guix/log/gnu/services/nix.scm?id=8a3b574b9c7ae6806247aefb22e6597c0ea4a8b7'>nix.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/services/nix.scm?id=8a3b574b9c7ae6806247aefb22e6597c0ea4a8b7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-15 10:13:24 +0000'>2022-12-15</span></td><td><a href='/guix/commit/gnu/services/nix.scm?id=f4dc53881b79b324ce7da731ac579a41c5078a48'>services: nix: Fix nix-shepherd-service.</a><span class='msg-avail'>...</span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2022-12-13 17:46:39 +0100'>2022-12-13</span></td><td><a href='/guix/commit/gnu/services/nix.scm?id=22acc0b0291cc067a6a3ce36c7ca8e5f68fe4db6'>services: nix: Add more configuration fields.</a><span class='msg-avail'>...</span></td><td>Petr Hodina</td></tr>
<tr><td><span title='2021-11-30 01:08:55 +0100'>2021-11-30</span></td><td><a href='/guix/commit/gnu/services/nix.scm?id=892f1b7273d57b25940700877a02618fe826cc08'>services: Accept &lt;inferior-package&gt;s in lieu of &lt;package&gt;s.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-04-26 20:03:55 +0300'>2021-04-26</span></td><td><a href='/guix/commit/gnu/services/nix.scm?id=43a7724040560d35e9e3a19bd1cfdb7e5c4c4711'>services: nix: Add /bin/sh to build-sandbox-paths.</a><span class='msg-avail'>...</span></td><td>Oleg Pykhalov</td></tr>