Rebase and update packages used

Author: ClausKlein

.clang-format

@@ -1,3 +1,10 @@
+---
+BasedOnStyle:    LLVM
+Language:        Json
+IndentWidth:     4
+UseTab:          Never
+---
+Language:        Cpp
 AccessModifierOffset: -2
 AlignAfterOpenBracket: DontAlign
 AlignConsecutiveAssignments: false
@@ -69,7 +76,6 @@ IndentWrappedFunctionNames: true
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
-Language: Cpp
 MacroBlockBegin: ''
 MacroBlockEnd: ''
 MaxEmptyLinesToKeep: 2

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21...3.27)
+cmake_minimum_required(VERSION 3.21...4.1)
 
 # This template attempts to be "fetch_content"-able
 # so that it works well with tools like CPM or other

CMakePresets.json

@@ -12,7 +12,19 @@
             "hidden": true,
             "generator": "Ninja",
             "binaryDir": "${sourceDir}/out/build/${presetName}",
-            "installDir": "${sourceDir}/out/install/${presetName}"
+            "installDir": "${sourceDir}/out/install/${presetName}",
+            "cacheVariables": {
+                "CMAKE_PREFIX_PATH": {
+                    "type": "path",
+                    "value": "${sourceDir}/out/install/${presetName}"
+                },
+                "CMAKE_CXX_EXTENSIONS": false,
+                "CMAKE_CXX_STANDARD": "23",
+                "CMAKE_CXX_STANDARD_REQUIRED": true,
+                "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+                "CMAKE_MESSAGE_LOG_LEVEL": "TRACE",
+                "CMAKE_SKIP_TEST_ALL_DEPENDENCY": false
+            }
         },
         {
             "name": "conf-windows-common",
@@ -188,6 +200,54 @@
             }
         }
     ],
+    "buildPresets":[
+        {
+            "name": "build-common",
+            "description": "Build CMake settings that apply to all configurations",
+            "hidden": true,
+            "jobs": 4
+        },
+        {
+            "name": "build-windows-msvc-debug-developer-mode",
+            "inherits": "build-common",
+            "configurePreset": "windows-msvc-debug-developer-mode"
+        },
+        {
+            "name": "build-windows-msvc-release-developer-mode",
+            "inherits": "build-common",
+            "configurePreset": "windows-msvc-release-developer-mode"
+        },
+        {
+            "name": "build-windows-clang-debug",
+            "inherits": "build-common",
+            "configurePreset": "windows-clang-debug"
+        },
+        {
+            "name": "build-windows-clang-release",
+            "inherits": "build-common",
+            "configurePreset": "windows-clang-release"
+        },
+        {
+            "name": "build-unixlike-gcc-debug",
+            "inherits": "build-common",
+            "configurePreset": "unixlike-gcc-debug"
+        },
+        {
+            "name": "build-unixlike-gcc-release",
+            "inherits": "build-common",
+            "configurePreset": "unixlike-gcc-release"
+        },
+        {
+            "name": "build-unixlike-clang-debug",
+            "inherits": "build-common",
+            "configurePreset": "unixlike-clang-debug"
+        },
+        {
+            "name": "build-unixlike-clang-release",
+            "inherits": "build-common",
+            "configurePreset": "unixlike-clang-release"
+        }
+    ],
     "testPresets": [
         {
             "name": "test-common",

Dependencies.cmake

@@ -9,15 +9,15 @@ function(myproject_setup_dependencies)
   # already been provided to us by a parent project
 
   if(NOT TARGET fmtlib::fmtlib)
-    cpmaddpackage("gh:fmtlib/fmt#11.1.4")
+    cpmaddpackage("gh:fmtlib/fmt#11.2.0")
   endif()
 
   if(NOT TARGET spdlog::spdlog)
     cpmaddpackage(
       NAME
       spdlog
       VERSION
-      1.15.2
+      1.15.3
       GITHUB_REPOSITORY
       "gabime/spdlog"
       OPTIONS

cmake/CPM.cmake

@@ -2,8 +2,8 @@
 #
 # SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
 
-set(CPM_DOWNLOAD_VERSION 0.40.8)
-set(CPM_HASH_SUM "78ba32abdf798bc616bab7c73aac32a17bbd7b06ad9e26a6add69de8f3ae4791")
+set(CPM_DOWNLOAD_VERSION 0.42.0)
+set(CPM_HASH_SUM "2020b4fc42dba44817983e06342e682ecfc3d2f484a581f11cc5731fbe4dce8a")
 
 if(CPM_SOURCE_CACHE)
   set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")

test/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.21...3.27)
+cmake_minimum_required(VERSION 3.21...4.1)
 
 project(CmakeConfigPackageTests LANGUAGES CXX)
 
@@ -17,7 +17,11 @@ endif()
 
 # ---- Dependencies ----
 
-include(${Catch2_SOURCE_DIR}/extras/Catch.cmake)
+if(Catch2_DIR)
+  include(${Catch2_DIR}/Catch.cmake)
+else()
+  include(${Catch2_SOURCE_DIR}/extras/Catch.cmake)
+endif()
 
 if(TARGET intro)
   # Provide a simple smoke test to make sure that the CLI works and can display a --help message