Upgrade Catch2

skaarj1989 · skaarj1989 · commit 326e6762dcec · 2022-06-21T11:09:54.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,16 +2,18 @@ cmake_minimum_required(VERSION 3.20)
 
 if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
   set(CMAKE_TOOLCHAIN_FILE
-      "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
-      CACHE STRING "")
+    "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+    CACHE STRING "")
 endif()
+
 message(STATUS "TOOLCHAIN: ${CMAKE_TOOLCHAIN_FILE}")
 
 project(FrameGraph)
+
 if(PROJECT_BINARY_DIR STREQUAL PROJECT_SOURCE_DIR)
   message(
     FATAL_ERROR
-      "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there."
+    "In-source builds not allowed. Please make a new directory (called a build directory) and run CMake from there."
   )
 endif()
 
@@ -25,11 +27,10 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") # .lib
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") # .dll
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") # .exe
-
-  option(BUILD_SHARED_LIBS "Use shared libraries" OFF)
-  set(BUILD_TESTING ON)
 endif()
 
+option(FG_BUILD_TEST ON)
+
 add_library(
   FrameGraph
   "include/fg/TypeTraits.hpp"
@@ -57,11 +58,13 @@ target_include_directories(
 
 add_library(fg::FrameGraph ALIAS FrameGraph)
 
-if(BUILD_TESTING)
+if(FG_BUILD_TEST)
   enable_testing()
   add_subdirectory(tests)
 endif()
 
 include(GNUInstallDirs)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/fg
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+install(
+  DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/fg
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
diff --git a/tests/test.cpp b/tests/test.cpp
@@ -1,7 +1,7 @@
-#define CATCH_CONFIG_MAIN
 #include "fg/FrameGraph.hpp"
 #include "fg/Blackboard.hpp"
-#include "catch2/catch.hpp"
+#include "catch.hpp"
+#include <fstream>
 
 struct BadResource {
   struct Desc {};
@@ -265,18 +265,26 @@ TEST_CASE("Blackboard", "[Blackboard]") {
   };
   bb.add<FooData>() = {1, 2, 3};
   REQUIRE(bb.has<FooData>());
+  REQUIRE(bb.try_get<FooData>());
+
+  auto *foo = bb.try_get<FooData>();
 
   struct BarData {
     int32_t i, j, k;
   };
   bb.add<BarData>(9, 8, 7);
   REQUIRE(bb.has<BarData>());
 
-  CHECK(bb.get<FooData>().x == 1);
-  CHECK(bb.get<FooData>().y == 2);
-  CHECK(bb.get<FooData>().z == 3);
-
   CHECK(bb.get<BarData>().i == 9);
   CHECK(bb.get<BarData>().j == 8);
   CHECK(bb.get<BarData>().k == 7);
+
+  CHECK(foo->x == 1);
+  CHECK(foo->y == 2);
+  CHECK(foo->z == 3);
+
+  foo->x = 100;
+  CHECK(bb.get<FooData>().x == 100);
 }
+
+int main(int argc, char *argv[]) { return Catch::Session().run(argc, argv); }
