build: clean up dependency integration

1 files changed, 21 insertions, 12 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4228310..3a83af3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,18 +5,19 @@ project("ttwhy"
   LANGUAGES CXX
 )
 
-### Fetch Dependencies
+include("CTest")
+
+### System Dependencies
+
+find_package("Threads")
+
+### External Dependencies
 
 include("FetchContent")
 
 FetchContent_Declare("asio"
   GIT_REPOSITORY "https://github.com/chriskohlhoff/asio"
-  GIT_TAG "asio-1-38-0"
-)
-
-FetchContent_Declare("catch2"
-  GIT_REPOSITORY "https://github.com/catchorg/Catch2.git"
-  GIT_TAG "v3.15.1"
+  GIT_TAG "asio-1-38-2"
 )
 
 FetchContent_Declare("sml"
@@ -24,16 +25,24 @@ FetchContent_Declare("sml"
   GIT_TAG "v1.2.0"
 )
 
+if (BUILD_TESTING)
+  FetchContent_Declare("Catch2"
+    GIT_REPOSITORY "https://github.com/catchorg/Catch2.git"
+    GIT_TAG "v3.16.0"
+    EXCLUDE_FROM_ALL
+    FIND_PACKAGE_ARGS
+  )
+endif()
+
+
 FetchContent_MakeAvailable(
   "asio"
-  "catch2"
+  "Catch2"
   "sml"
 )
 
 ### asio
 
-find_package("Threads")
-
 add_library("asio" INTERFACE)
 add_library("ext::asio" ALIAS "asio")
 
@@ -104,9 +113,9 @@ target_link_libraries("ttwhy" PRIVATE
 
 ### Tests
 
-include("CTest")
-
 if(BUILD_TESTING)
+  find_package("Catch2")
+
   include("Catch")
 
   add_executable("ttwhy-tests")