Include fmt/base.h when available

pika-org · Apr 11, 2024 · 2acfe06 · 2acfe06
1 parent 9b51f5a
commit 2acfe06
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 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
@@ -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
@@ -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
@@ -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
@@ -18,7 +18,6 @@
 
 #include <pika/config.hpp>
 
-#include <fmt/core.h>
 #include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <fmt/printf.h>