fmt on xlc+nvcc

src/thirdparty/CMakeLists.txt

@@ -71,16 +71,6 @@ set(fmt_headers
     fmt/chrono.h
     fmt/color.h
     fmt/locale.h
-    fmt/time.h
-    )
-
-# Do not include the following source files in the headers list even
-# though they are explicitly included by the headers. It will cause CMake
-# to try to compile them in anything that depends on fmt outside
-# of this directory due to CMake's file property scope (directory based)
-
-set(fmt_headers_sources
-    fmt/format.cc
     )
 
 blt_add_library(NAME    fmt

src/thirdparty/fmt/core.h

@@ -1571,12 +1571,23 @@ class format_arg_store
 
   friend class basic_format_args<Context>;
 
+// AXOM PATCH: workaround for bug in combination of [email protected] + nvcc
+//    desc ended up being undefined, pulling out new type_encoding worked
+
+  // original:
+  // static constexpr unsigned long long desc =
+  //     (is_packed ? detail::encode_types<Context, Args...>()
+  //                : detail::is_unpacked_bit | num_args) |
+  //     (num_named_args != 0
+  //          ? static_cast<unsigned long long>(detail::has_named_args_bit)
+  //          : 0);
+
+  static constexpr unsigned long long type_encoding = detail::encode_types<Context, Args...>();
   static constexpr unsigned long long desc =
-      (is_packed ? detail::encode_types<Context, Args...>()
-                 : detail::is_unpacked_bit | num_args) |
-      (num_named_args != 0
-           ? static_cast<unsigned long long>(detail::has_named_args_bit)
-           : 0);
+      (is_packed ? type_encoding : detail::is_unpacked_bit | num_args) |
+      (num_named_args != 0 ? static_cast<unsigned long long>(detail::has_named_args_bit) : 0);
+
+// END AXOM PATCH
 
  public:
   format_arg_store(const Args&... args)