From d293c95a08306bd5d8761830f5bf3f234a2576ed Mon Sep 17 00:00:00 2001
From: Rene Halver <r.halver@fz-juelich.de>
Date: Tue, 9 Feb 2021 09:29:12 +0100
Subject: [PATCH] updated VTK package search in CMakeLists.txt
---
CMakeLists.txt | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e9122c..de77a50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,16 +72,29 @@ find_dependency(MPI)\n"
if(CM_ALL_VTK_OUTPUT)
message("Using VTK output")
- find_package(VTK REQUIRED COMPONENTS
- vtkCommonCore
- vtkCommonDataModel
- vtkFiltersProgrammable
- vtkIOParallelXML
- vtkIOXML
- vtkParallelMPI
- )
+ find_package(VTK)
if(NOT VTK_FOUND)
message(FATAL_ERROR "VTK not found, help CMake to find it by setting VTK_LIBRARY and VTK_INCLUDE_DIR")
+ else()
+ if (VTK_MAJOR_VERSION GREATER_EQUAL 9)
+ find_package(VTK REQUIRED COMPONENTS
+ CommonCore
+ CommonDataModel
+ FiltersProgrammable
+ IOParallelXML
+ IOXML
+ ParallelMPI
+ )
+ else()
+ find_package(VTK REQUIRED COMPONENTS
+ vtkCommonCore
+ vtkCommonDataModel
+ vtkFiltersProgrammable
+ vtkIOParallelXML
+ vtkIOXML
+ vtkParallelMPI
+ )
+ endif()
endif()
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/Config.cmake.in "find_dependency(VTK)\n")
endif(CM_ALL_VTK_OUTPUT)
--
GitLab