Add missing includes and upgrade Catch2 (#4)

pisa-engine · Nov 1, 2023 · 94b9b9f · 94b9b9f
1 parent 25ff64e
commit 94b9b9f
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5)
 project(wapopp VERSION 1.0 LANGUAGES CXX)
 
 if (CMAKE_BUILD_TYPE)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -1,8 +1,3 @@
-EXECUTE_PROCESS(COMMAND git submodule update --init
-                WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/..
-                OUTPUT_QUIET
-        )
-
 # Add JSON for Modern C++
 if(NOT TARGET nlohmann_json)
     set(JSON_BuildTests OFF CACHE INTERNAL "")

diff --git a/external/Catch2 b/external/Catch2
diff --git a/include/wapopp/wapopp.hpp b/include/wapopp/wapopp.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
+#include <cstdint>
 #include <istream>
 #include <ostream>
 #include <string>
 #include <variant>
+#include <vector>
 
 namespace wapopp {
 
@@ -18,14 +20,10 @@ struct SimpleContent {
     std::string content;
     std::string mime;
 };
-struct Kicker : public SimpleContent {
-};
-struct Title : public SimpleContent {
-};
-struct Byline : public SimpleContent {
-};
-struct Text : public SimpleContent {
-};
+struct Kicker : public SimpleContent {};
+struct Title : public SimpleContent {};
+struct Byline : public SimpleContent {};
+struct Text : public SimpleContent {};
 struct Date {
     std::uint64_t timestamp;
 };

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -2,6 +2,7 @@ add_executable(test_detail test_detail.cpp)
 target_include_directories(test_detail PRIVATE "${PROJECT_SOURCE_DIR}/include/")
 target_link_libraries(test_detail
     nlohmann_json
+    Catch2Main
     Catch2
 )
 add_test(test_detail test_detail)
@@ -10,6 +11,7 @@ add_executable(test_wapopp test_wapopp.cpp)
 target_link_libraries(test_wapopp
     wapopp
     nlohmann_json
+    Catch2Main
     Catch2
 )
 add_test(test_wapopp test_wapopp)
diff --git a/test/test_detail.cpp b/test/test_detail.cpp
@@ -1,5 +1,6 @@
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <iostream>
+
+#include <catch2/catch_test_macros.hpp>
 
 #include "wapopp/detail.hpp"
 

diff --git a/test/test_wapopp.cpp b/test/test_wapopp.cpp
@@ -1,6 +1,6 @@
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <sstream>
 
+#include <catch2/catch_test_macros.hpp>
 #include <nlohmann/json.hpp>
 
 #include "wapopp/wapopp.hpp"