#3088 support vtk 9.x

Chaste · Feb 2, 2022 · 2d47416 · 2d47416
1 parent a18592d
commit 2d47416
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -330,17 +330,27 @@ if (Chaste_USE_VTK)
 
     # Depending on the VTK version, we need different components. 5.x require the following
     if (VTK_MAJOR_VERSION EQUAL 5)
-        find_package (VTK COMPONENTS vtkIO vtkCommon vtkGraphics z REQUIRED)
+        find_package(VTK COMPONENTS vtkIO vtkCommon vtkGraphics z REQUIRED)
         # 6.0 and 6.1 require the following
     elseif ((VTK_MAJOR_VERSION EQUAL 6) AND (VTK_MINOR_VERSION LESS 2))
-        find_package (VTK COMPONENTS vtkCommonCore vtkCommonDataModel vtkFiltersCore vtkFiltersGeneral vtkFiltersGeneric
-                      vtkFiltersGeometry vtkFiltersModeling vtkFiltersSources vtkIOCore vtkIOGeometry
-                      vtkIOLegacy vtkIOXML REQUIRED)
-        # 6.2 and up, up to and including 7.1, require the following
+        find_package(
+                VTK COMPONENTS vtkCommonCore vtkCommonDataModel vtkFiltersCore vtkFiltersGeneral vtkFiltersGeneric
+                vtkFiltersGeometry vtkFiltersModeling vtkFiltersSources vtkIOCore vtkIOGeometry vtkIOLegacy vtkIOXML
+                REQUIRED
+        )
+        # 6.2 and up, up to and including 8.x, require the following
+    elseif (VTK_MAJOR_VERSION LESS 9)
+        find_package(
+                VTK COMPONENTS vtkCommonCore vtkCommonDataModel vtkFiltersCore vtkFiltersGeneral vtkFiltersGeneric
+                vtkFiltersGeometry vtkFiltersModeling vtkFiltersSources vtkIOCore vtkIOGeometry vtkIOLegacy
+                vtkIOParallelXML vtkIOXML REQUIRED
+        )
+        # VTK 9.0 and above require the following
     else ()
-        find_package (VTK COMPONENTS vtkCommonCore vtkCommonDataModel vtkFiltersCore vtkFiltersGeneral vtkFiltersGeneric
-                      vtkFiltersGeometry vtkFiltersModeling vtkFiltersSources vtkIOCore vtkIOGeometry
-                      vtkIOLegacy vtkIOParallelXML vtkIOXML REQUIRED)
+        find_package(
+                VTK COMPONENTS CommonCore CommonDataModel FiltersCore FiltersGeneral FiltersGeneric FiltersGeometry
+                FiltersModeling FiltersSources IOCore IOGeometry IOLegacy IOParallelXML IOXML REQUIRED
+        )
     endif ()
 
     add_definitions (-DCHASTE_VTK)

diff --git a/mesh/src/reader/VtkMeshReader.cpp b/mesh/src/reader/VtkMeshReader.cpp
@@ -41,6 +41,8 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef CHASTE_VTK
 
+#include <vtkCellTypes.h>
+
 #include "VtkMeshReader.hpp"
 #include "Exception.hpp"