Merge branch 'SpdlogUpdate' into 'master'

Update spdlog to 1.15.0 See merge request ogs/ogs!5207
ufz · Jan 21, 2025 · 4dbefc7 · 4dbefc7
2 parents 1d6959f + f07f509
commit 4dbefc7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 1 deletion.
diff --git a/Applications/Utils/MeshEdit/editMaterialID.cpp b/Applications/Utils/MeshEdit/editMaterialID.cpp
@@ -7,6 +7,7 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <spdlog/fmt/bundled/ranges.h>
 #include <tclap/CmdLine.h>
 
 #include <memory>

diff --git a/GeoLib/IO/NetCDFRasterReader.cpp b/GeoLib/IO/NetCDFRasterReader.cpp
@@ -9,6 +9,8 @@
 
 #include "GeoLib/IO/NetCDFRasterReader.h"
 
+#include <spdlog/fmt/bundled/ranges.h>
+
 #include <filesystem>
 #include <numeric>
 #ifdef OGS_USE_NETCDF

diff --git a/MaterialLib/Utils/MediaCreation.cpp b/MaterialLib/Utils/MediaCreation.cpp
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#include <spdlog/fmt/bundled/ranges.h>
+
 #include <range/v3/range/conversion.hpp>
 #include <range/v3/view/adjacent_remove_if.hpp>
 

diff --git a/MeshLib/IO/XDMF/writeXdmf.cpp b/MeshLib/IO/XDMF/writeXdmf.cpp
@@ -9,6 +9,8 @@
 
 #include "writeXdmf.h"
 
+#include <spdlog/fmt/bundled/ranges.h>
+
 #include <algorithm>
 #include <array>
 #include <fstream>

diff --git a/NumLib/NewtonRaphson.h b/NumLib/NewtonRaphson.h
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include <spdlog/fmt/bundled/ranges.h>
+
 #include <Eigen/Core>
 #include <optional>
 

diff --git a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp
@@ -12,6 +12,8 @@
 
 #include "FixedTimeStepping.h"
 
+#include <spdlog/fmt/bundled/ranges.h>
+
 #include <algorithm>
 #include <cassert>
 #include <limits>

diff --git a/ProcessLib/Output/CreateOutputConfig.cpp b/ProcessLib/Output/CreateOutputConfig.cpp
@@ -10,6 +10,8 @@
 
 #include "CreateOutputConfig.h"
 
+#include <spdlog/fmt/bundled/ranges.h>
+
 #include <map>
 
 #include "BaseLib/Algorithm.h"

diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
@@ -37,7 +37,7 @@ else()
     CPMAddPackage(
         NAME spdlog
         GITHUB_REPOSITORY gabime/spdlog
-        VERSION 1.12.0
+        VERSION 1.15.0
         OPTIONS "BUILD_SHARED_LIBS OFF" SYSTEM TRUE
     )
 endif()