catch2 - 2

mhekkel · Jan 28, 2025 · 12bc698 · 12bc698
1 parent 0fc1680
commit 12bc698
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -64,7 +64,6 @@ jobs:
         -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
         -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
         -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-        -DFETCH_CATCH2=ON
         -S ${{ github.workspace }}
 
     - name: Build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -104,22 +104,18 @@ if(BUILD_TESTING)
 		FetchContent_MakeAvailable(Catch2)
 	endif()
 
-	if(TARGET Catch2::Catch2WithMain)
-		file(GLOB UNIT_TEST_RSRC LIST_DIRECTORIES true ${PROJECT_SOURCE_DIR}/rsrc/*)
+	file(GLOB UNIT_TEST_RSRC LIST_DIRECTORIES true ${PROJECT_SOURCE_DIR}/rsrc/*)
 
-		add_custom_command(OUTPUT mrc-unit-test-rsrc.obj
-			COMMAND $<TARGET_FILE:mrc-bootstrap> -o mrc-unit-test-rsrc.obj ${UNIT_TEST_RSRC} ${COFF_SPEC}
-			DEPENDS ${UNIT_TEST_RSRC} mrc-bootstrap
-		)
-
-		add_executable(mrc-unit-test ${PROJECT_SOURCE_DIR}/src/mrc-unit-test.cpp ${CMAKE_BINARY_DIR}/mrc-unit-test-rsrc.obj)
+	add_custom_command(OUTPUT mrc-unit-test-rsrc.obj
+		COMMAND $<TARGET_FILE:mrc-bootstrap> -o mrc-unit-test-rsrc.obj ${UNIT_TEST_RSRC} ${COFF_SPEC}
+		DEPENDS ${UNIT_TEST_RSRC} mrc-bootstrap
+	)
 
-		target_link_libraries(mrc-unit-test Catch2::Catch2WithMain)
+	add_executable(mrc-unit-test ${PROJECT_SOURCE_DIR}/src/mrc-unit-test.cpp ${CMAKE_BINARY_DIR}/mrc-unit-test-rsrc.obj)
 
-		add_test(NAME unit-test COMMAND $<TARGET_FILE:mrc-unit-test> WORKING_DIRECTORY .)
-	else()
-		message(WARNING "No Catch2::Catch2WithMain target, something is wrong")
-	endif()
+	target_link_libraries(mrc-unit-test Catch2::Catch2WithMain)
+
+	add_test(NAME unit-test COMMAND $<TARGET_FILE:mrc-unit-test> WORKING_DIRECTORY .)
 endif()
 
 install(TARGETS mrc)