From 229e3f61f45a1d5d99676a16f2ef31ac8df26da7 Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Sun, 16 Oct 2022 13:24:28 -0600 Subject: [PATCH] Use doctest-provided `main` implementation --- test/CMakeLists.txt | 3 +-- test/DoctestMain.cpp | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 test/DoctestMain.cpp diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 005703c1..bd0a42c1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,7 +12,6 @@ include(doctest) add_subdirectory(install) add_library(sfml-test-main STATIC - DoctestMain.cpp TestUtilities/SystemUtil.hpp TestUtilities/SystemUtil.cpp TestUtilities/WindowUtil.hpp @@ -22,7 +21,7 @@ add_library(sfml-test-main STATIC ) target_include_directories(sfml-test-main PUBLIC TestUtilities) target_compile_definitions(sfml-test-main PUBLIC DOCTEST_CONFIG_REQUIRE_STRINGIFICATION_FOR_ALL_USED_TYPES) -target_link_libraries(sfml-test-main PUBLIC SFML::System doctest::doctest) +target_link_libraries(sfml-test-main PUBLIC SFML::System doctest::doctest_with_main) set_target_warnings(sfml-test-main) set(SYSTEM_SRC diff --git a/test/DoctestMain.cpp b/test/DoctestMain.cpp deleted file mode 100644 index 0a3f254e..00000000 --- a/test/DoctestMain.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN -#include