Skip to content

Update CMakeLists.vtk.txt and includes vtk_fmt

Jaswant Panchumarti (Kitware) requested to merge (removed):ioss/for/vtk into ioss/for/vtk
  1. remove catch.hpp from CMakeLists.vtk.txt because upstream removed the file.
  2. Ioss_FieldManager.C was newly added. Replace fmt with vtk_fmt.

Here's the diff.

git diff gitlab/ioss/for/vtk 
diff --git a/packages/seacas/libraries/ioss/src/CMakeLists.vtk.txt b/packages/seacas/libraries/ioss/src/CMakeLists.vtk.txt
index ae92d5dc76..0648e72f4a 100644
--- a/packages/seacas/libraries/ioss/src/CMakeLists.vtk.txt
+++ b/packages/seacas/libraries/ioss/src/CMakeLists.vtk.txt
@@ -197,7 +197,6 @@ list(APPEND sources
   transform/Iotr_Factory.C)
 
 list(APPEND headers
-  catch.hpp
   bhopscotch_map.h
   bhopscotch_set.h
   hopscotch_growth_policy.h
diff --git a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C
index 9c21bf272c..dbd4006200 100644
--- a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C
+++ b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.C
@@ -9,7 +9,8 @@
 #include <Ioss_Sort.h>
 #include <cassert>
 #include <cstddef>
-#include <fmt/ostream.h>
+#include "vtk_fmt.h"
+#include VTK_FMT(fmt/ostream.h)
 #include <map>
 #include <string>
 #include <utility>

Merge request reports