Move all dependencies over to CPM

2022-02-11 12:17:27 +01:00
parent c960f3fa0b
commit b7c27cb1f8
41 changed files with 58 additions and 14276 deletions
--- a/tests/BattleTests/DamageTests.cpp
+++ b/tests/BattleTests/DamageTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Library/DamageLibrary.hpp"
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../TestLibrary/TestLibrary.hpp"
--- a/tests/LibraryTests/NatureLibraryTests.cpp
+++ b/tests/LibraryTests/NatureLibraryTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Library/Natures/NatureLibrary.hpp"
 #include "../../src/Library/Statistic.hpp"

--- a/tests/LibraryTests/SpeciesLibraryTests.cpp
+++ b/tests/LibraryTests/SpeciesLibraryTests.cpp
@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Library/Species/SpeciesLibrary.hpp"

 TEST_CASE("Able to build and destroy empty library") {
--- a/tests/LibraryTests/SpeciesTests.cpp
+++ b/tests/LibraryTests/SpeciesTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Library/Species/PokemonSpecies.hpp"


--- a/tests/LibraryTests/StatCalculationTests.cpp
+++ b/tests/LibraryTests/StatCalculationTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../TestLibrary/TestLibrary.hpp"

--- a/tests/PokemonTests/BasicPokemonTests.cpp
+++ b/tests/PokemonTests/BasicPokemonTests.cpp
@@ -1,7 +1,7 @@
 #ifdef TESTS_BUILD
 #include <CreatureLib/Battling/TurnChoices/AttackTurnChoice.hpp>
 #include <CreatureLib/Battling/TurnChoices/PassTurnChoice.hpp>
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Battle/Battle.hpp"
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/Battling/Pokemon/PokemonParty.hpp"
--- a/tests/PokemonTests/ExperienceGainTests.cpp
+++ b/tests/PokemonTests/ExperienceGainTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Library/ExperienceLibrary.hpp"
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../TestLibrary/TestLibrary.hpp"
--- a/tests/ScriptTests/BaseScriptClassTests.cpp
+++ b/tests/ScriptTests/BaseScriptClassTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../src/ScriptResolving/AngelScript/ContextPool.hpp"
--- a/tests/ScriptTests/ItemUseScriptTests.cpp
+++ b/tests/ScriptTests/ItemUseScriptTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../TestLibrary/TestLibrary.hpp"
--- a/tests/ScriptTests/MetadataTests.cpp
+++ b/tests/ScriptTests/MetadataTests.cpp
@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 #include <Arbutils/StringView.hpp>
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/ScriptResolving/AngelScript/AngelScriptMetadata.hpp"

 TEST_CASE("Metadata without parameters") {
--- a/tests/ScriptTests/ScriptOwnerTest.cpp
+++ b/tests/ScriptTests/ScriptOwnerTest.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../src/ScriptResolving/AngelScript/ContextPool.hpp"
--- a/tests/ScriptTests/ScriptResolverTests.cpp
+++ b/tests/ScriptTests/ScriptResolverTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../src/ScriptResolving/AngelScript/ContextPool.hpp"
 #include "../TestLibrary/TestLibrary.hpp"
--- a/tests/ScriptTests/ScriptTypeTests/Battle/BattleTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Battle/BattleTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../../../src/Battling/Battle/Battle.hpp"
 #include "../../../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
--- a/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
--- a/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
--- a/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
--- a/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
--- a/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
--- a/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp
+++ b/tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp
@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../../../src/ScriptResolving/AngelScript/AngelScriptResolver.hpp"
 #include "../../../../src/ScriptResolving/AngelScript/ContextPool.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"