Remove vendored doctest header

test/CMakeLists.txt

@@ -1,3 +1,12 @@
+include(FetchContent)
+
+set(DOCTEST_NO_INSTALL ON)
+FetchContent_Declare(doctest
+    GIT_REPOSITORY "https://github.com/doctest/doctest.git"
+    GIT_TAG v2.4.9
+)
+FetchContent_MakeAvailable(doctest)
+
 add_library(sfml-test-main STATIC
     DoctestMain.cpp
     TestUtilities/SystemUtil.hpp
@@ -7,10 +16,9 @@ add_library(sfml-test-main STATIC
     TestUtilities/GraphicsUtil.hpp
     TestUtilities/GraphicsUtil.cpp
 )
-target_include_directories(sfml-test-main SYSTEM PUBLIC "${PROJECT_SOURCE_DIR}/extlibs/headers")
 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)
+target_link_libraries(sfml-test-main PUBLIC SFML::System doctest::doctest)
 set_target_warnings(sfml-test-main)
 
 SET(SYSTEM_SRC

test/DoctestMain.cpp

@@ -1,2 +1,2 @@
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include <doctest.h>
+#include <doctest/doctest.h>

test/Graphics/BlendMode.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/BlendMode.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 

test/Graphics/CircleShape.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/CircleShape.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
 
@@ -9,7 +9,7 @@ TEST_CASE("sf::CircleShape class - [graphics]")
     SUBCASE("Default constructor")
     {
         const sf::CircleShape circle;
-        CHECK(circle.getRadius() == 0);
+        CHECK(circle.getRadius() == 0.f);
         CHECK(circle.getPointCount() == 30);
         for (std::size_t i = 0; i < circle.getPointCount(); ++i)
             CHECK(circle.getPoint(i) == sf::Vector2f(0, 0));

test/Graphics/Color.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/Color.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 

test/Graphics/ConvexShape.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/ConvexShape.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
 

test/Graphics/Glyph.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/Glyph.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 
@@ -9,7 +9,7 @@ TEST_CASE("sf::Glyph class - [graphics]")
     SUBCASE("Construction")
     {
         const sf::Glyph glyph;
-        CHECK(glyph.advance == 0);
+        CHECK(glyph.advance == 0.f);
         CHECK(glyph.lsbDelta == 0);
         CHECK(glyph.rsbDelta == 0);
         CHECK(glyph.bounds == sf::FloatRect());

test/Graphics/Image.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/Image.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 #include <array>

test/Graphics/Rect.cpp

@@ -1,7 +1,7 @@
 #include <SFML/Graphics/Rect.hpp>
 #include <SFML/System/Vector2.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 

test/Graphics/RectangleShape.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/RectangleShape.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
 

test/Graphics/RenderStates.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/RenderStates.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 

test/Graphics/Shape.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/Shape.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 

test/Graphics/Transform.cpp

@@ -1,7 +1,7 @@
 #include <SFML/Graphics/Transform.hpp>
 #include <SFML/System/Angle.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 #include <vector>

test/Graphics/Transformable.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/Transformable.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 

test/Graphics/Vertex.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/Vertex.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 

test/Graphics/VertexArray.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/VertexArray.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 

test/Graphics/View.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Graphics/View.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <GraphicsUtil.hpp>
 

test/Network/IpAddress.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Network/IpAddress.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <sstream>
 #include <string_view>

test/Network/Packet.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Network.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <limits>
 

test/System/Angle.cpp

@@ -1,6 +1,6 @@
 #include <SFML/System/Angle.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
 
@@ -11,8 +11,8 @@ TEST_CASE("sf::Angle class - [system]")
         SUBCASE("Default constructor")
         {
             const sf::Angle angle;
-            CHECK(angle.asDegrees() == 0);
-            CHECK(angle.asRadians() == 0);
+            CHECK(angle.asDegrees() == 0.f);
+            CHECK(angle.asRadians() == 0.f);
         }
 
         SUBCASE("wrapSigned()")
@@ -80,8 +80,8 @@ TEST_CASE("sf::Angle class - [system]")
 
     SUBCASE("Constants")
     {
-        CHECK(sf::Angle::Zero.asDegrees() == 0);
-        CHECK(sf::Angle::Zero.asRadians() == 0);
+        CHECK(sf::Angle::Zero.asDegrees() == 0.f);
+        CHECK(sf::Angle::Zero.asRadians() == 0.f);
     }
 
     SUBCASE("Operators")
@@ -225,8 +225,8 @@ TEST_CASE("sf::Angle class - [system]")
             CHECK(sf::degrees(10) / 2.5f == sf::degrees(4));
             CHECK(sf::radians(12) / 3 == sf::radians(4));
 
-            CHECK(sf::Angle::Zero / sf::degrees(1) == 0);
-            CHECK(sf::degrees(10) / sf::degrees(10) == 1);
+            CHECK(sf::Angle::Zero / sf::degrees(1) == 0.f);
+            CHECK(sf::degrees(10) / sf::degrees(10) == 1.f);
             CHECK(sf::radians(10) / sf::radians(2) == Approx(5.f));
         }
 

test/System/Clock.cpp

@@ -1,7 +1,7 @@
 #include <SFML/System/Clock.hpp>
 #include <SFML/System/Time.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
 #include <thread>

test/System/Err.cpp

@@ -1,6 +1,6 @@
 #include <SFML/System/Err.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <sstream>
 

test/System/FileInputStream.cpp

@@ -1,6 +1,6 @@
 #include <SFML/System/FileInputStream.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <cassert>
 #include <fstream>

test/System/MemoryInputStream.cpp

@@ -1,6 +1,6 @@
 #include <SFML/System/MemoryInputStream.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <ostream>
 #include <string_view>

test/System/Time.cpp

@@ -1,6 +1,6 @@
 #include <SFML/System/Time.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
 
@@ -162,7 +162,7 @@ TEST_CASE("sf::Time class - [system]")
             CHECK(sf::seconds(1) / static_cast<sf::Int64>(2) == sf::seconds(0.5f));
             CHECK(sf::seconds(42) / static_cast<sf::Int64>(2) == sf::seconds(21));
             CHECK(sf::seconds(1) / sf::seconds(1) == 1.0f);
-            CHECK(sf::milliseconds(10) / sf::microseconds(1) == doctest::Approx(10'000.0).epsilon(1e-6));
+            CHECK(sf::milliseconds(10) / sf::microseconds(1) == Approx(10'000.f));
         }
 
         SUBCASE("operator/=")

test/System/Vector2.cpp

@@ -1,6 +1,6 @@
 #include <SFML/System/Vector2.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
 #include <cmath>

test/System/Vector3.cpp

@@ -1,6 +1,6 @@
 #include <SFML/System/Vector3.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
 #include <type_traits>

test/TestUtilities/SystemUtil.cpp

@@ -2,7 +2,7 @@
 #include <SFML/System/String.hpp>
 #include <SFML/System/Time.hpp>
 
-#include <doctest.h> // for Approx
+#include <doctest/doctest.h>
 
 #include <SystemUtil.hpp>
 

test/Window/ContextSettings.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Window/ContextSettings.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 TEST_CASE("sf::ContextSettings class - [window]")
 {

test/Window/VideoMode.cpp

@@ -1,6 +1,6 @@
 #include <SFML/Window/VideoMode.hpp>
 
-#include <doctest.h>
+#include <doctest/doctest.h>
 
 #include <WindowUtil.hpp>