Skip to content
Snippets Groups Projects
Commit 18fe2289 authored by Spiros Tsalikis's avatar Spiros Tsalikis
Browse files

Merge branch 'upstream-diy2' into update-diy-use-internal-fmt

# By Diy2 Upstream
* upstream-diy2:
  diy2 2025-03-12 (cb906317)
parents 897d0d01 7a605163
No related branches found
No related tags found
No related merge requests found
...@@ -6,3 +6,6 @@ into another source tree. ...@@ -6,3 +6,6 @@ into another source tree.
* Add attributes to pass commit checks within VTK. * Add attributes to pass commit checks within VTK.
* Add a CMake file to install headers into VTK's install tree. * Add a CMake file to install headers into VTK's install tree.
* Use VTK's MPI library.
* Use VTK's fmt library.
* Definition of template functions in header files should be inline.
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
#ifndef DIY_USE_SPDLOG #ifndef DIY_USE_SPDLOG
#include <memory> #include <memory>
#include "thirdparty/fmt/format.h" #include "vtk_fmt.h"
#include "thirdparty/fmt/ostream.h" #include VTK_FMT(fmt/format.h)
#include VTK_FMT(fmt/ostream.h)
namespace diy namespace diy
{ {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
/// to thier correct types. /// to thier correct types.
#ifndef DIY_HAS_MPI #ifndef DIY_HAS_MPI
# include <mpi.h> # include <vtk_mpi.h>
#endif #endif
namespace diy namespace diy
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment