Handle dependencies through CPM

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 include(CheckIPOSupported)
-include(CMakeLists.txt.in)
+include(CPM.cmake)
 
 project(CreatureLib)
 
@@ -15,7 +15,22 @@ option(TESTS "Whether the test executable should be build as well." OFF)
 option(STATICC "Whether gcc and stdc++ should be linked statically to the library." OFF)
 set(LEVEL_SIZE "8" CACHE STRING "Number of bits to store the level as. Currently reserved, and can only be 8")
 
-include_arbutils()
+CPMAddPackage(
+        NAME Arbutils
+        GIT_REPOSITORY https://git.p-epsilon.com/Deukhoofd/Arbutils.git
+        GIT_TAG master
+        OPTIONS
+        "SHARED=${SHARED}"
+        "WINDOWS=${WINDOWS}"
+        "STATICC=${STATICC}"
+)
+if (Arbutils_ADDED)
+    execute_process(COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/include)
+    execute_process(COMMAND ln -sf ${Arbutils_SOURCE_DIR}/src
+            ${CMAKE_CURRENT_BINARY_DIR}/include/Arbutils)
+
+endif ()
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     add_compile_options(-fconcepts)
@@ -98,10 +113,17 @@ endif ()
 target_link_libraries(CreatureLib PUBLIC ${_LIBRARYLINKS} Threads::Threads)
 
 if (TESTS)
+    CPMAddPackage(
+            NAME doctest
+            GITHUB_REPOSITORY doctest/doctest
+            GIT_TAG 2.4.0
+            DOWNLOAD_ONLY YES
+    )
     # Create Test executable
     file(GLOB_RECURSE TEST_FILES "tests/*.cpp" "tests/*.hpp")
-    add_executable(CreatureLibTests ${TEST_FILES} extern/doctest.hpp)
+    add_executable(CreatureLibTests ${TEST_FILES})
     target_link_libraries(CreatureLibTests PUBLIC CreatureLib Arbutils)
+    target_include_directories(CreatureLibTests PUBLIC ${doctest_SOURCE_DIR}/doctest)
 
     # Add a definition for the test library
     target_compile_definitions(CreatureLibTests PRIVATE TESTS_BUILD)

CMakeLists.txt.in

@@ -1,49 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-
-project(arbutils-download NONE)
-
-include(ExternalProject)
-ExternalProject_Add(arbutils
-        GIT_REPOSITORY https://git.p-epsilon.com/Deukhoofd/Arbutils
-        GIT_TAG master
-        PREFIX "${CMAKE_CURRENT_BINARY_DIR}/Arbutils"
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-        TEST_COMMAND ""
-        CMAKE_ARGS "-DSHARED=${SHARED} -DWINDOWS=${WINDOWS} -DSTATICC=${STATICC}"
-        )
-
-
-function(include_arbutils)
-    # Download and unpack googletest at configure time
-    configure_file(CMakeLists.txt.in Arbutils/download/CMakeLists.txt)
-    execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Arbutils/download)
-    if (result)
-        message(FATAL_ERROR "CMake step for arbutils failed: ${result}")
-    endif ()
-    execute_process(COMMAND ${CMAKE_COMMAND} --build .
-            RESULT_VARIABLE result
-            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Arbutils/download)
-    if (result)
-        message(FATAL_ERROR "Build step for arbutils failed: ${result}")
-    endif ()
-
-    # Add googletest directly to our build. This defines
-    # the gtest and gtest_main targets.
-    add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/Arbutils/src/arbutils
-            ${CMAKE_CURRENT_BINARY_DIR}/Arbutils/bin
-            EXCLUDE_FROM_ALL)
-
-    execute_process(COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/Arbutils/include)
-    execute_process(COMMAND ln -s ${CMAKE_CURRENT_BINARY_DIR}/Arbutils/src/arbutils/src
-            ${CMAKE_CURRENT_BINARY_DIR}/Arbutils/include/Arbutils)
-    execute_process(COMMAND ln -s ${CMAKE_CURRENT_BINARY_DIR}/Arbutils/src/arbutils/extern
-            ${CMAKE_CURRENT_BINARY_DIR}/Arbutils/include/extern)
-
-    include_directories(${CMAKE_CURRENT_BINARY_DIR}/Arbutils/include)
-
-
-endfunction()

tests/BattleTests/ChoiceQueueTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Flow/ChoiceQueue.hpp"
 #include "../../src/Battling/Models/BattleSide.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"

tests/BattleTests/ChoiceSetTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Models/Battle.hpp"
 #include "../../src/Battling/Models/BattleSide.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"

tests/BattleTests/CloneTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/History/HistoryElements/AttackUseHistory.hpp"
 #include "../../src/Battling/Models/Battle.hpp"
 #include "../../src/Battling/Models/BattleSide.hpp"

tests/BattleTests/CreaturePartyTests.cpp

@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Models/CreateCreature.hpp"
 #include "../../src/Battling/Models/CreatureParty.hpp"
 #include "../TestLibrary/TestLibrary.hpp"

tests/BattleTests/CreatureTests.cpp

@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Models/Battle.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"
 #include "../TestLibrary/TestLibrary.hpp"

tests/BattleTests/EventHookTests.cpp

@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/EventHooks/EventDataClasses.hpp"
 #include "../../src/Battling/EventHooks/EventHook.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"

tests/BattleTests/ScriptTests/ScriptAggregatorTests.cpp

@@ -1,7 +1,6 @@
 #ifdef TESTS_BUILD
 
-#include <utility>
+#include <doctest.h>
-#include "../../../extern/doctest.hpp"
 #include "../../../src/Battling/ScriptHandling/ScriptAggregator.hpp"
 
 using namespace CreatureLib;

tests/BattleTests/ScriptTests/ScriptSetTests.cpp

@@ -1,7 +1,6 @@
 #ifdef TESTS_BUILD
 
-#include <utility>
+#include <doctest.h>
-#include "../../../extern/doctest.hpp"
 #include "../../../src/Battling/ScriptHandling/ScriptSet.hpp"
 
 using namespace CreatureLib;

tests/BattleTests/ScriptTests/ScriptSourceTest.cpp

@@ -1,7 +1,7 @@
 #ifdef TESTS_BUILD
 
 #include "../../../src/Battling/ScriptHandling/ScriptSource.hpp"
-#include "../../../extern/doctest.hpp"
+#include <doctest.h>
 
 using namespace CreatureLib;
 using namespace CreatureLib::Battling;

tests/BattleTests/TurnOrderTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Flow/TurnOrdering.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"
 #include "../../src/Battling/TurnChoices/AttackTurnChoice.hpp"

tests/ExceptionTests.cpp

@@ -1,7 +1,7 @@
 #ifdef TESTS_BUILD
 #include <cstring>
+#include <doctest.h>
 #include "../CInterface/Core.hpp"
-#include "../extern/doctest.hpp"
 
 TEST_CASE("When throwing exception, what() is readable") {
     bool hasCaught = false;

tests/Integration/BattleIntegrations.cpp

@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Battling/Models/Battle.hpp"
 #include "../../src/Battling/Models/BattleParty.hpp"
 #include "../../src/Battling/Models/CreateCreature.hpp"

tests/LibraryTests/BaseLibraryTests.cpp

@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Library/BaseLibrary.hpp"
 #include "../TestLibrary/TestLibrary.hpp"
 

tests/LibraryTests/EffectParameterTests.cpp

@@ -1,5 +1,5 @@
 #ifdef TESTS_BUILD
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Library/EffectParameter.hpp"
 
 using namespace CreatureLib::Library;

tests/LibraryTests/SpeciesTest.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../../src/Library/CreatureData/CreatureSpecies.hpp"
 
 using namespace CreatureLib::Library;

tests/LibraryTests/TestLibraryTests.cpp

@@ -1,7 +1,7 @@
 #ifdef TESTS_BUILD
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 
-#include "../../extern/doctest.hpp"
+#include <doctest.h>
 #include "../TestLibrary/TestLibrary.hpp"
 
 TEST_CASE("Can Create Attack Library") {