updated libraries, changed catch2 for being compatible with major version 3

Author: StephanKa

CMakeLists.txt

@@ -5,6 +5,8 @@ PROJECT(myproject
         LANGUAGES CXX
         VERSION 0.0.1)
 
+SET(CMAKE_CXX_STANDARD 20)
+
 INCLUDE(cmake/StandardProjectSettings.cmake)
 INCLUDE(cmake/PreventInSourceBuilds.cmake)
 INCLUDE(cmake/CodeFormat.cmake)
@@ -20,7 +22,7 @@ CONFIGURE_FILE("templates/version.hpp.in" "${CMAKE_BINARY_DIR}/generated/include
 
 # Link this 'library' to set the c++ standard / compile-time options requested
 ADD_LIBRARY(project_options INTERFACE)
-TARGET_COMPILE_FEATURES(project_options INTERFACE cxx_std_17)
+TARGET_COMPILE_FEATURES(project_options INTERFACE cxx_std_${CMAKE_CXX_STANDARD})
 
 IF(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
     OPTION(ENABLE_BUILD_WITH_TIME_TRACE "Enable -ftime-trace to generate time tracing .json files on clang" OFF)

cmake/Conan.cmake

@@ -10,20 +10,22 @@ macro(run_conan)
   conan_cmake_run(
     REQUIRES
     ${CONAN_EXTRA_REQUIRES}
-    catch2/2.13.9
-    gtest/cci.20210126
+    catch2/3.2.1
+    gtest/1.12.1
     docopt.cpp/0.6.3
-    fmt/8.1.1
-    spdlog/1.10.0
-    sml/1.1.5
-    nlohmann_json/3.10.5
-    boost/1.78.0
-    crowcpp-crow/1.0+1
-    cppzmq/4.8.1
-    protobuf/3.20.0
+    fmt/9.1.0
+    spdlog/1.11.0
+    sml/1.1.6
+    nlohmann_json/3.11.2
+    boost/1.80.0
+    crowcpp-crow/1.0+3
+    cppzmq/4.9.0
+    protobuf/3.21.9
     OPTIONS
     ${CONAN_EXTRA_OPTIONS}
     gtest:build_gmock=True
+    SETTINGS
+    compiler.cppstd=${CMAKE_CXX_STANDARD}
     BASIC_SETUP
     CMAKE_TARGETS # individual targets to link to
     BUILD

test/catch2/CMakeLists.txt

@@ -15,7 +15,7 @@ CATCH_DISCOVER_TESTS(
         TEST_PREFIX
         "catch_unittests."
         REPORTER
-        xml
+        JUnit
         OUTPUT_DIR
         .
         OUTPUT_PREFIX
@@ -32,7 +32,7 @@ CATCH_DISCOVER_TESTS(
         TEST_PREFIX
         "catch_constexpr."
         REPORTER
-        xml
+        JUnit
         OUTPUT_DIR
         .
         OUTPUT_PREFIX
@@ -51,7 +51,7 @@ CATCH_DISCOVER_TESTS(
         TEST_PREFIX
         "catch_relaxed_constexpr."
         REPORTER
-        xml
+        JUnit
         OUTPUT_DIR
         .
         OUTPUT_PREFIX

test/catch2/catch_main.cpp

@@ -1,5 +1,3 @@
 #define CATCH_CONFIG_MAIN // This tells the catch header to generate a main
 
-#include <catch2/catch.hpp>
-
-
+#include <catch2/catch_all.hpp>

test/catch2/constexpr_tests.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 constexpr unsigned int Factorial(unsigned int number) { return number <= 1 ? number : Factorial(number - 1) * number; }
 

test/catch2/tests.cpp

@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 unsigned int Factorial(unsigned int number) { return number <= 1 ? number : Factorial(number - 1) * number; }