replace catch2 submodule with fetchcontent

tud-zih-energy · Apr 30, 2024 · e42648e · e42648e
1 parent f77cf44
commit e42648e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,7 +57,6 @@ if(MSVC)
 endif()
 
 include(cmake/GitSubmoduleUpdate.cmake)
-git_submodule_update()
 
 if(Git_FOUND)
     _is_git(${CMAKE_CURRENT_SOURCE_DIR} IN_GIT)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -14,12 +14,15 @@ macro(NitroTest TEST)
     add_test(${TEST_NAME} ${TEST_NAME})
 endmacro()
 
-add_library(catch2 INTERFACE)
-target_include_directories(catch2 SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/Catch/single_include)
-add_library(Catch2::Catch2 ALIAS catch2)
+include(FetchContent)
+FetchContent_Declare(Catch2
+    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+    GIT_TAG v2.13.10
+    FIND_PACKAGE_ARGS
+)
+FetchContent_MakeAvailable(Catch2)
 
 add_library(nitro_test_main OBJECT catch_main.cpp)
-target_include_directories(nitro_test_main SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Catch/single_include)
 target_compile_features(nitro_test_main
     PRIVATE
         cxx_auto_type
@@ -46,6 +49,7 @@ target_compile_features(nitro_test_main
         cxx_variadic_templates
         cxx_template_template_parameters
 )
+target_link_libraries(nitro_test_main PUBLIC Catch2::Catch2)
 
 if(NOT CMAKE_C_COMPILER_ID MATCHES "MSVC")
     add_library(nitro_test_lib SHARED nitro_test_lib.cpp)

diff --git a/tests/Catch b/tests/Catch