From dbf6b97b8b5fc070958ee545d4fa4af8ebf1e43e Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Fri, 3 Feb 2023 15:03:02 +0100 Subject: [PATCH] Fix usage of fmt include. Now fmt is used as a regular package. Before it was bundled with spdlog. --- BaseLib/FileTools.cpp | 2 +- GeoLib/AABB.h | 2 +- .../ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h | 2 +- Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BaseLib/FileTools.cpp b/BaseLib/FileTools.cpp index d591c095ecc..fabf7b3da65 100644 --- a/BaseLib/FileTools.cpp +++ b/BaseLib/FileTools.cpp @@ -14,7 +14,7 @@ #include "FileTools.h" -#include <spdlog/fmt/bundled/core.h> +#include <fmt/core.h> #include <boost/algorithm/string/predicate.hpp> #include <filesystem> diff --git a/GeoLib/AABB.h b/GeoLib/AABB.h index 7fce1e79c74..05840e63213 100644 --- a/GeoLib/AABB.h +++ b/GeoLib/AABB.h @@ -14,7 +14,7 @@ #pragma once -#include <spdlog/fmt/bundled/ostream.h> +#include <fmt/ostream.h> #include <Eigen/Core> #include <bitset> diff --git a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h index a2c741b9080..d925a4bd769 100644 --- a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h +++ b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h @@ -11,7 +11,7 @@ #pragma once -#include <spdlog/fmt/ostr.h> +#include <fmt/format.h> #include <Eigen/LU> #include <cassert> diff --git a/Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp b/Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp index 818d1c7bad1..a6a9ff9d36b 100644 --- a/Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp +++ b/Tests/MaterialLib/CheckStiffnessMatrixMFront.cpp @@ -9,9 +9,9 @@ #ifdef OGS_USE_MFRONT +#include <fmt/format.h> #include <gmock/gmock-matchers.h> #include <gtest/gtest.h> -#include <spdlog/fmt/ostr.h> #include "BaseLib/ConfigTree.h" #include "MaterialLib/SolidModels/MFront/CreateMFrontGeneric.h" -- GitLab