openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File fixup-vtk.patch of Package ASL

From fb0090223fbea42e33c0f86c543bdcb13e285079 Mon Sep 17 00:00:00 2001
From: StefanBruens <stefan.bruens@rwth-aachen.de>
Date: Sun, 20 Feb 2022 03:28:53 +0100
Subject: [PATCH] Fixup VTK 7.x support, remove VTK 6.x support

find_package without version would allow VTK 6.x with a missing
vtkftgl component, so specify a minimum version.
Remove VTK 6.x, as VTK 7.1.1 is the oldest supported version
from Kitware (see https://vtk.org/download/) and 7.1 is 5 years old.
Add missing vtkFiltersHybrid component, required for e.g.
`vtkImplicitModeller::ComputeModelBounds`.
---
 CMakeLists.txt | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 008dbf4..3d35e41 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,12 +47,10 @@ include(ASLBuildFunctions)
 find_package(OpenCL 1.1 REQUIRED)
 # ToDo: check - system component might be not needed any longer on new versions of Boost
 find_package(Boost 1.53 REQUIRED COMPONENTS program_options filesystem system)
-# ToDo: remove support for VTK 6.1 at some point in future
-find_package(VTK 6.1 QUIET COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOGeometry vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtkftgl vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
-if(NOT VTK_FOUND)
-	find_package(VTK REQUIRED COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkIOCore vtkIOGeometry vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
-endif()
-include(${VTK_USE_FILE})
+find_package(VTK 7.1 REQUIRED
+  COMPONENTS vtkRenderingCore vtkImagingCore vtkFiltersCore vtkFiltersHybrid vtkIOCore
+             vtkIOGeometry vtkIOLegacy vtkIOXML vtkIOMINC vtkCommonCore vtkViewsCore
+	     vtksys vtkDICOMParser vtkexpat vtkzlib NO_MODULE)
 
 include_directories(SYSTEM ${OpenCL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})

Places

File fixup-vtk.patch of Package ASL

Places