#24 update cmake for vtk9

Author: kwabenantim

CMakeLists.txt

@@ -33,7 +33,7 @@
 find_package(Chaste COMPONENTS cell_based)
 
 # PyChaste needs some additional VTK libraries
-if(VTK_MAJOR_VERSION LESS_EQUAL 6)
+if(VTK_MAJOR_VERSION LESS 7)
     find_package(VTK REQUIRED COMPONENTS
         vtkInteractionStyle
         vtkIOImage
@@ -44,24 +44,38 @@ if(VTK_MAJOR_VERSION LESS_EQUAL 6)
         vtkRenderingOpenGL
         vtkWrappingPythonCore
     )
-else()
+elseif(VTK_MAJOR_VERSION LESS 9)
     find_package(VTK REQUIRED COMPONENTS
-        vtkFiltersProgrammable
-        vtkFiltersVerdict
         vtkInteractionStyle
         vtkIOImage
         vtkIOMovie
         vtkRenderingAnnotation
         vtkRenderingCore
         vtkRenderingFreeType
-        vtkRenderingOpenGL2
+        vtkRenderingOpenGL
         vtkWrappingPythonCore
     )
+else()
+    find_package(VTK REQUIRED COMPONENTS
+        FiltersProgrammable
+        FiltersVerdict
+        InteractionStyle
+        IOImage
+        IOMovie
+        RenderingAnnotation
+        RenderingCore
+        RenderingFreeType
+        RenderingOpenGL2
+        WrappingPythonCore
+    )
 endif()
 
-list(APPEND Chaste_INCLUDES ${VTK_INCLUDE_DIRS})
-list(APPEND Chaste_project_PyChaste_INCLUDE_DIRS ${VTK_INCLUDE_DIRS})
-list(APPEND Chaste_THIRD_PARTY_LIBRARIES ${VTK_LIBRARIES})
+if (VTK_MAJOR_VERSION LESS 9)
+    list(APPEND Chaste_INCLUDES ${VTK_INCLUDE_DIRS})
+    list(APPEND Chaste_project_PyChaste_INCLUDE_DIRS ${VTK_INCLUDE_DIRS})
+    list(APPEND Chaste_THIRD_PARTY_LIBRARIES ${VTK_LIBRARIES})
+endif ()
+
 chaste_do_project(PyChaste)
 
 # Include the Python wrapping build logic

WrapPython.cmake

@@ -124,7 +124,7 @@ foreach(val RANGE ${len2})
         PREFIX "${PYTHON_MODULE_PREFIX}" SUFFIX ".so")
     target_compile_features(_chaste_project_PyChaste_${python_module} PRIVATE cxx_range_for)
     # order is important, pybind and python come first
-    target_link_libraries(_chaste_project_PyChaste_${python_module} pybind11::module ${PYTHON3_LIBRARIES} ${Chaste_THIRD_PARTY_LIBRARIES} ${Chaste_LIBRARIES} ${PYCHASTE_SHARED_LIB})
+    target_link_libraries(_chaste_project_PyChaste_${python_module} pybind11::module ${PYTHON3_LIBRARIES} ${Chaste_THIRD_PARTY_LIBRARIES} ${Chaste_LIBRARIES} ${PYCHASTE_SHARED_LIB} Chaste_COMMON_DEPS)
     add_dependencies(_chaste_project_PyChaste_${python_module} chaste_project_PyChaste)
 endforeach()