Documentation/release/dev/update-diy-use-internal-fmt.md

+## Update diy to use internal fmt
+
+The `diy` third-party library now uses the internal `fmt` library. This change
+is necessary to avoid conflicts with diy's `fmt`.

ThirdParty/diy2/CMakeLists.txt

@@ -8,7 +8,7 @@ vtk_module_third_party_internal(
   SPDX_COPYRIGHT_TEXT
     "Copyright (c) 2015, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy)"
   SPDX_DOWNLOAD_LOCATION
-    "git+https://gitlab.kitware.com/third-party/diy2.git@for/vtk-20250128-3.6.0-1"
+    "git+https://gitlab.kitware.com/spiros.tsalikis/diy2.git@cb9063174ce3d49e5d7f7e8abbaec51b8753b05b"
   VERSION
     "3.6.0"
 )
@@ -23,6 +23,12 @@ else ()
   vtk_module_definitions(VTK::diy2 INTERFACE DIY_HAS_MPI=0)
 endif ()
 
+if (TARGET VTK::fmt)
+  vtk_module_link(VTK::diy2
+    INTERFACE
+      VTK::fmt)
+endif ()
+
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/vtk_diy2.h.in"
   "${CMAKE_CURRENT_BINARY_DIR}/vtk_diy2.h")

ThirdParty/diy2/update.sh

@@ -7,8 +7,8 @@ shopt -s dotglob
 readonly name="diy2"
 readonly ownership="Diy2 Upstream <kwrobot@kitware.com>"
 readonly subtree="ThirdParty/$name/vtk$name"
-readonly repo="https://gitlab.kitware.com/third-party/diy2.git"
-readonly tag="for/vtk-20250203-0cde57f9b"
+readonly repo="https://gitlab.kitware.com/spiros.tsalikis/diy2.git"
+readonly tag="cb9063174ce3d49e5d7f7e8abbaec51b8753b05b"
 readonly paths="
 .gitattributes
 CMakeLists.vtk.txt

ThirdParty/diy2/vtk.module

@@ -2,6 +2,8 @@ NAME
   VTK::diy2
 LIBRARY_NAME
   vtkdiy2
+DEPENDS
+  VTK::fmt
 OPTIONAL_DEPENDS
   VTK::mpi
 TEST_DEPENDS

ThirdParty/diy2/vtkdiy2/README.kitware.md

@@ -6,3 +6,6 @@ into another source tree.
 
   * Add attributes to pass commit checks within VTK.
   * 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.

ThirdParty/diy2/vtkdiy2/include/vtkdiy2/log.hpp

@@ -4,8 +4,9 @@
 #ifndef DIY_USE_SPDLOG
 
 #include <memory>
-#include "thirdparty/fmt/format.h"
-#include "thirdparty/fmt/ostream.h"
+#include "vtk_fmt.h"
+#include VTK_FMT(fmt/format.h)
+#include VTK_FMT(fmt/ostream.h)
 
 namespace diy
 {

ThirdParty/diy2/vtkdiy2/include/vtkdiy2/mpi/mpi_cast.hpp

@@ -5,7 +5,7 @@
 /// to thier correct types.
 
 #ifndef DIY_HAS_MPI
-#  include <mpi.h>
+#  include <vtk_mpi.h>
 #endif
 
 namespace diy