#2216: Rollback fmt version to 7.1.3 due to CUDA

DARMA-tasking · Sep 20, 2024 · 0413147 · 0413147
1 parent b79920b
commit 0413147
Show file tree

Hide file tree

Showing 16 changed files with 6,507 additions and 12,556 deletions.
diff --git a/cmake_config.h.in b/cmake_config.h.in
@@ -95,15 +95,13 @@
 #if vt_feature_cmake_external_fmt
   #define INCLUDE_FMT_CORE <fmt/core.h>
   #define INCLUDE_FMT_FORMAT <fmt/format.h>
-  #define INCLUDE_FMT_RANGES <fmt/ranges.h>
   #define INCLUDE_FMT_OSTREAM <fmt/ostream.h>
 
   #define VT_FMT_NAMESPACE_BEGIN namespace fmt {
   #define VT_FMT_NAMESPACE_END }
 #else
   #define INCLUDE_FMT_CORE <fmt-vt/core.h>
   #define INCLUDE_FMT_FORMAT <fmt-vt/format.h>
-  #define INCLUDE_FMT_RANGES <fmt-vt/ranges.h>
   #define INCLUDE_FMT_OSTREAM <fmt-vt/ostream.h>
 
   #define VT_FMT_NAMESPACE_BEGIN namespace fmt { inline namespace vt {

diff --git a/lib/fmt/CMakeLists.txt b/lib/fmt/CMakeLists.txt
@@ -9,8 +9,7 @@ function(add_headers VAR)
 endfunction()
 
 # Define the fmt library, its includes and the needed defines.
-add_headers(FMT_HEADERS args.h color.h core.h format-inl.h ostream.h ranges.h
-            xchar.h chrono.h compile.h format.h printf.h std.h)
+add_headers(FMT_HEADERS core.h format.h format-inl.h ostream.h)
 set(FMT_SOURCES src/format.cc)
 
 add_library(fmt ${FMT_SOURCES} ${FMT_HEADERS})

diff --git a/lib/fmt/include/fmt-vt/args.h b/lib/fmt/include/fmt-vt/args.h