From 2acfe06ae63111158380f5e612808a24fc51dcd9 Mon Sep 17 00:00:00 2001
From: Mikael Simberg <mikael.simberg@iki.fi>
Date: Mon, 18 Mar 2024 10:51:15 +0100
Subject: [PATCH] Include fmt/base.h when available

---
 .../include/pika/execution/algorithms/require_started.hpp   | 6 +++++-
 libs/pika/logging/include/pika/logging/message.hpp          | 1 -
 .../logging/src/format/formatter/high_precision_time.cpp    | 6 +++++-
 libs/pika/logging/src/format/formatter/thread_id.cpp        | 1 -
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/libs/pika/execution/include/pika/execution/algorithms/require_started.hpp b/libs/pika/execution/include/pika/execution/algorithms/require_started.hpp
index 0ff0eee83..f077ab24f 100644
--- a/libs/pika/execution/include/pika/execution/algorithms/require_started.hpp
+++ b/libs/pika/execution/include/pika/execution/algorithms/require_started.hpp
@@ -20,7 +20,11 @@
 #include <pika/type_support/detail/with_result_of.hpp>
 #include <pika/type_support/pack.hpp>
 
-#include <fmt/core.h>
+#if __has_include(<fmt/base.h>)
+# include <fmt/base.h>
+#else
+# include <fmt/core.h>
+#endif
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
 
diff --git a/libs/pika/logging/include/pika/logging/message.hpp b/libs/pika/logging/include/pika/logging/message.hpp
index 222f2b20d..4e190a96e 100644
--- a/libs/pika/logging/include/pika/logging/message.hpp
+++ b/libs/pika/logging/include/pika/logging/message.hpp
@@ -19,7 +19,6 @@
 #include <pika/config.hpp>
 #include <pika/type_support/unused.hpp>
 
-#include <fmt/core.h>
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
diff --git a/libs/pika/logging/src/format/formatter/high_precision_time.cpp b/libs/pika/logging/src/format/formatter/high_precision_time.cpp
index 1d809c087..6610b6cdd 100644
--- a/libs/pika/logging/src/format/formatter/high_precision_time.cpp
+++ b/libs/pika/logging/src/format/formatter/high_precision_time.cpp
@@ -18,7 +18,11 @@
 
 #include <pika/config.hpp>
 
-#include <fmt/core.h>
+#if __has_include(<fmt/base.h>)
+# include <fmt/base.h>
+#else
+# include <fmt/core.h>
+#endif
 #include <fmt/ostream.h>
 #include <fmt/printf.h>
 
diff --git a/libs/pika/logging/src/format/formatter/thread_id.cpp b/libs/pika/logging/src/format/formatter/thread_id.cpp
index bb100f11d..0301ddb17 100644
--- a/libs/pika/logging/src/format/formatter/thread_id.cpp
+++ b/libs/pika/logging/src/format/formatter/thread_id.cpp
@@ -18,7 +18,6 @@
 
 #include <pika/config.hpp>
 
-#include <fmt/core.h>
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <fmt/printf.h>