From 44b83113ecc41ea61e3bea32a626358a03ce7ac3 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Wed, 19 Aug 2020 09:26:49 +0100
Subject: [PATCH 2/6] Unbundle catch

---
 CMakeLists.txt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89b92ba3..c3c59c87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -395,12 +395,9 @@ add_dependencies(nrniv_lib hh_update)
 # Add tests if enabled
 # =============================================================================
 if(NRN_ENABLE_TESTS)
-  add_external_project(catch2)
-  set(CATCH_DIR ${PROJECT_SOURCE_DIR}/external/catch2)
-  list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/external/catch2/contrib)
-  include(CTest)
-  include(Catch)
-  find_python_module(pytest)
+    include(CTest)
+    find_package(Catch2 REQUIRED)
+    find_python_module(pytest)
   if(NRN_ENABLE_PYTHON AND NOT PYTEST_FOUND)
     message(SEND_ERROR "pytest Python package is required.")
   endif()
-- 
2.28.0