Replace Catch header by a xmake package

tests/Engine/Audio/AlgorithmAudioTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Audio/Algorithm.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <array>
 

tests/Engine/Audio/MusicTest.cpp

@@ -1,6 +1,6 @@
 #include <Nazara/Audio/Audio.hpp>
 #include <Nazara/Audio/Music.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <chrono>
 #include <thread>
 

tests/Engine/Audio/SoundBufferTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Audio/SoundBuffer.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 std::filesystem::path GetResourceDir();
 

tests/Engine/Audio/SoundEmitterTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Audio/Sound.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 std::filesystem::path GetResourceDir();
 

tests/Engine/Audio/SoundTest.cpp

@@ -1,6 +1,6 @@
 #include <Nazara/Audio/Audio.hpp>
 #include <Nazara/Audio/Sound.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <chrono>
 #include <thread>
 

tests/Engine/Core/AbstractHashTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/AbstractHash.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Nazara/Core/ByteArray.hpp>
 

tests/Engine/Core/AlgorithmCoreTest.cpp

@@ -1,7 +1,7 @@
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/StringExt.hpp>
 #include <Nazara/Math/Vector2.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 TEST_CASE("Apply", "[CORE][ALGORITHM]")
 {

tests/Engine/Core/BitsetTest.cpp

@@ -1,6 +1,6 @@
 #include <Nazara/Core/Algorithm.hpp>
 #include <Nazara/Core/Bitset.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <array>
 #include <string>
 #include <iostream>

tests/Engine/Core/ByteArrayTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/ByteArray.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <string>
 

tests/Engine/Core/ByteStreamTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/ByteStream.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <array>
 

tests/Engine/Core/ClockTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/Clock.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <chrono>
 #include <thread>
 

tests/Engine/Core/ColorTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/Color.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 const float epsilon = 1.f;
 

tests/Engine/Core/ErrorTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/Error.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Error", "[CORE][ERROR]")
 {

tests/Engine/Core/FileTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/File.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 std::filesystem::path GetResourceDir();
 

tests/Engine/Core/MemoryPoolTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/MemoryPool.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Nazara/Math/Vector2.hpp>
 

tests/Engine/Core/ObjectHandleTest.cpp

@@ -1,6 +1,6 @@
 #include <Nazara/Core/HandledObject.hpp>
 #include <Nazara/Core/ObjectHandle.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 struct ObjectHandle_Test : public Nz::HandledObject<ObjectHandle_Test>
 {

tests/Engine/Core/ObjectRefTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/ObjectRef.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 class Test : public Nz::RefCounted
 {

tests/Engine/Core/ParameterListTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/ParameterList.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 void nullAction(void*)
 {

tests/Engine/Core/PrimitiveListTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/PrimitiveList.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("PrimitiveList", "[CORE][PRIMITIVELIST]")
 {

tests/Engine/Core/RefCountedTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/RefCounted.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("RefCounted", "[CORE][REFCOUNTED]")
 {

tests/Engine/Core/SerializationTest.cpp

@@ -7,7 +7,7 @@
 #include <Nazara/Math/Ray.hpp>
 #include <array>
 
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Serialization", "[CORE][SERIALIZATION]")
 {

tests/Engine/Core/SignalTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/Signal.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 struct Incrementer
 {

tests/Engine/Core/SparsePtrTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/SparsePtr.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <array>
 

tests/Engine/Core/StackVectorTest.cpp

@@ -1,6 +1,6 @@
 #include <Nazara/Core/MovablePtr.hpp>
 #include <Nazara/Core/StackVector.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <array>
 #include <numeric>
 

tests/Engine/Core/StringExtTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Core/StringExt.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("String", "[CORE][STRING]")
 {

tests/Engine/Math/AlgorithmMathTest.cpp

@@ -1,6 +1,6 @@
 #include <Nazara/Math/Algorithm.hpp>
 #include <Nazara/Math/Angle.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <limits>
 
 TEST_CASE("Approach", "[MATH][ALGORITHM]")

tests/Engine/Math/AngleTest.cpp

@@ -1,7 +1,7 @@
 #include <Nazara/Math/Angle.hpp>
 #include <Nazara/Math/EulerAngles.hpp>
 #include <Nazara/Math/Quaternion.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Angle", "[MATH][ANGLE]")
 {

tests/Engine/Math/BoundingVolumeTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/BoundingVolume.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("BoundingVolume", "[MATH][BOUNDINGVOLUME]")
 {

tests/Engine/Math/BoxTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/Box.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Box", "[MATH][BOX]")
 {

tests/Engine/Math/EulerAnglesTest.cpp

@@ -1,6 +1,6 @@
 #include <Nazara/Math/Angle.hpp>
 #include <Nazara/Math/EulerAngles.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("EulerAngles", "[MATH][EULERANGLES]")
 {

tests/Engine/Math/FrustumTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/Frustum.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Frustum", "[MATH][FRUSTUM]")
 {

tests/Engine/Math/Matrix4Test.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/Matrix4.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <array>
 

tests/Engine/Math/OrientedBoxTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/OrientedBox.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("OrientedBox", "[MATH][ORIENTEDBOX]")
 {

tests/Engine/Math/PlaneTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/Plane.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Plane", "[MATH][PLANE]")
 {

tests/Engine/Math/QuaternionTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/Quaternion.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Quaternion", "[MATH][QUATERNION]")
 {

tests/Engine/Math/RayTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/Ray.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Ray", "[MATH][RAY]")
 {

tests/Engine/Math/RectTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/Rect.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Rect", "[MATH][RECT]")
 {

tests/Engine/Math/SphereTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/Sphere.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Sphere", "[MATH][SPHERE]")
 {

tests/Engine/Math/Vector2Test.cpp

@@ -1,4 +1,4 @@
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Math/Vector4.hpp>

tests/Engine/Math/Vector3Test.cpp

@@ -1,4 +1,4 @@
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <Nazara/Math/Vector2.hpp>
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Math/Vector4.hpp>

tests/Engine/Math/Vector4Test.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Math/Vector4.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Nazara/Math/Vector3.hpp>
 

tests/Engine/Network/IpAddressTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Network/IpAddress.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("IpAddress", "[NETWORK][IPADDRESS]")
 {

tests/Engine/Network/SocketPollerTest.cpp

@@ -3,7 +3,7 @@
 #include <Nazara/Network/SocketPoller.hpp>
 #include <Nazara/Network/TcpClient.hpp>
 #include <Nazara/Network/TcpServer.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <random>
 
 SCENARIO("SocketPoller", "[NETWORK][SOCKETPOLLER]")

tests/Engine/Network/TCPTest.cpp

@@ -2,7 +2,7 @@
 #include <Nazara/Network/NetPacket.hpp>
 #include <Nazara/Network/TcpClient.hpp>
 #include <Nazara/Network/TcpServer.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <chrono>
 #include <random>
 #include <thread>

tests/Engine/Network/UdpSocketTest.cpp

@@ -1,7 +1,7 @@
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Network/UdpSocket.hpp>
 #include <Nazara/Network/NetPacket.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <random>
 
 SCENARIO("UdpSocket", "[NETWORK][UDPSOCKET]")

tests/Engine/Physics2D/Collider2DTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Physics2D/Collider2D.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("Collider2D", "[PHYSICS2D][COLLIDER2D]")
 {

tests/Engine/Physics2D/PhysWorld2DTest.cpp

@@ -1,5 +1,5 @@
 #include <Nazara/Physics2D/PhysWorld2D.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 Nz::RigidBody2D CreateBody(Nz::PhysWorld2D& world, const Nz::Vector2f& position, bool isMoving = true, const Nz::Vector2f& lengths = Nz::Vector2f::Unit());
 

tests/Engine/Physics2D/RigidBody2DTest.cpp

@@ -1,6 +1,6 @@
 #include <Nazara/Physics2D/RigidBody2D.hpp>
 #include <Nazara/Physics2D/PhysWorld2D.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <iostream>
 #include <limits>
 

tests/Engine/Shader/AccessMemberTest.cpp

@@ -4,7 +4,7 @@
 #include <Nazara/Shader/ShaderBuilder.hpp>
 #include <Nazara/Shader/SpirvPrinter.hpp>
 #include <Nazara/Shader/SpirvWriter.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <cctype>
 
 void ExpectingGLSL(Nz::ShaderAst::StatementPtr& shader, std::string_view expectedOutput)

tests/SDK/NDK/BaseSystem.cpp

@@ -2,7 +2,7 @@
 #include <NazaraSDK/Components/NodeComponent.hpp>
 #include <NazaraSDK/Components/VelocityComponent.hpp>
 #include <NazaraSDK/World.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 namespace
 {

tests/SDK/NDK/Component.cpp

@@ -1,5 +1,5 @@
 #include <NazaraSDK/Component.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 namespace
 {

tests/SDK/NDK/Entity.cpp

@@ -1,6 +1,6 @@
 #include <NazaraSDK/World.hpp>
 #include <NazaraSDK/Component.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 namespace
 {

tests/SDK/NDK/EntityList.cpp

@@ -1,6 +1,6 @@
 #include <NazaraSDK/EntityList.hpp>
 #include <NazaraSDK/World.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("EntityList", "[NDK][ENTITYLIST]")
 {

tests/SDK/NDK/EntityOwner.cpp

@@ -1,6 +1,6 @@
 #include <NazaraSDK/EntityOwner.hpp>
 #include <NazaraSDK/World.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("EntityOwner", "[NDK][ENTITYOWNER]")
 {

tests/SDK/NDK/StateMachine.cpp

@@ -1,5 +1,5 @@
 #include <NazaraSDK/StateMachine.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 class TestState : public Ndk::State
 {

tests/SDK/NDK/System.cpp

@@ -1,5 +1,5 @@
 #include <NazaraSDK/System.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 namespace
 {

tests/SDK/NDK/Systems/PhysicsSystem2D.cpp

@@ -4,7 +4,7 @@
 #include <NazaraSDK/Components/NodeComponent.hpp>
 #include <NazaraSDK/Components/PhysicsComponent2D.hpp>
 #include <NazaraSDK/Systems/PhysicsSystem2D.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 #include <limits>
 
 Ndk::EntityHandle CreateBaseEntity(Ndk::World& world, const Nz::Vector2f& position, const Nz::Rectf& AABB);

tests/SDK/NDK/Systems/PhysicsSystem3D.cpp

@@ -4,7 +4,7 @@
 #include <NazaraSDK/Components/NodeComponent.hpp>
 #include <NazaraSDK/Components/PhysicsComponent3D.hpp>
 #include <NazaraSDK/Systems/PhysicsSystem3D.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("PhysicsSystem3D", "[NDK][PHYSICSSYSTEM3D]")
 {

tests/SDK/NDK/Systems/VelocitySystem.cpp

@@ -2,7 +2,7 @@
 #include <NazaraSDK/World.hpp>
 #include <NazaraSDK/Components/NodeComponent.hpp>
 #include <NazaraSDK/Components/VelocityComponent.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 SCENARIO("VelocitySystem", "[NDK][VELOCITYSYSTEM]")
 {

tests/SDK/NDK/World.cpp

@@ -1,6 +1,6 @@
 #include <NazaraSDK/World.hpp>
 #include <NazaraSDK/Component.hpp>
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 namespace
 {

tests/main.cpp

@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_RUNNER
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/AbstractLogger.hpp>

tests/main_client.cpp

@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_RUNNER
-#include <Catch/catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Nazara/Core/Log.hpp>
 #include <Nazara/Core/AbstractLogger.hpp>

tests/xmake.lua

@@ -3,11 +3,15 @@ if is_mode("asan") then
 	add_defines("CATCH_CONFIG_NO_POSIX_SIGNALS")
 end
 
+add_requires("catch2")
+
 target("NazaraClientUnitTests")
 	set_group("Tests")
 	set_kind("binary")
 
 	add_deps("NazaraClientSDK")
+	add_packages("catch2")
+
 	add_files("main_client.cpp")
 	add_files("resources.cpp")
 	add_files("Engine/**.cpp")
@@ -17,6 +21,8 @@ target("NazaraUnitTests")
 	set_kind("binary")
 
 	add_deps("NazaraSDK")
+	add_packages("catch2")
+
 	add_files("main.cpp")
 	add_files("resources.cpp")
 	add_files("Engine/**.cpp")