Skip to content

Commit 9c045a1

Browse files
phcerdanphcerdan
committed
COMP: Remove "vtk" prefix from VTK COMPONENTS
In modern VTK (> 8.90) the COMPONENT names don't have the "vtk" prefix. This fix get the VTK version first, and then look for the COMPONENTS with the right name, prepending ${_vtk_prefix} to the names. The examples using ITKVtkGlue (`ENABLE_QUICKVIEW` = ON) re-use the variable `_vtk_prefix` defined in the top CMakeLists. The examples that depend on `VTK` and `ITK without ITKVTKGlue` set `_vtk_prefix` by their own. Fix #241
1 parent 4e71f6b commit 9c045a1

File tree

61 files changed

+217
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+217
-137
lines changed

‎src/Bridge/VtkGlue/VTKImageToITKImage/CMakeLists.txt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@ project(VTKImageToITKImage)
55
find_package(ITK REQUIRED)
66
include(${ITK_USE_FILE})
77

8+
find_package(VTK REQUIRED)
9+
set(_vtk_prefix "")
10+
if(VTK_VERSION VERSION_LESS "8.90.0")
11+
set(_vtk_prefix "vtk")
12+
endif()
813
find_package(VTK REQUIRED
914
COMPONENTS
10-
vtkImagingColor
11-
vtkIOImage
12-
vtkRenderingCore
13-
vtkRenderingGL2PSOpenGL2
15+
${_vtk_prefix}ImagingColor
16+
${_vtk_prefix}IOImage
17+
${_vtk_prefix}RenderingCore
18+
${_vtk_prefix}RenderingGL2PSOpenGL2
1419
)
1520
if(VTK_VERSION VERSION_LESS "8.90.0")
1621
include(${VTK_USE_FILE})

‎src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetAsElevationMap/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ project( VisualizeStaticDense2DLevelSetAsElevationMap )
55
find_package( ITK REQUIRED )
66
include( ${ITK_USE_FILE} )
77

8+
find_package(VTK REQUIRED)
9+
set(_vtk_prefix "")
10+
if(VTK_VERSION VERSION_LESS "8.90.0")
11+
set(_vtk_prefix "vtk")
12+
endif()
813
find_package( VTK REQUIRED
914
COMPONENTS
10-
vtkInteractionImage
11-
vtkRenderingCore
12-
vtkRenderingGL2PSOpenGL2
15+
${_vtk_prefix}InteractionImage
16+
${_vtk_prefix}RenderingCore
17+
${_vtk_prefix}RenderingGL2PSOpenGL2
1318
)
1419
if( VTK_VERSION VERSION_LESS "8.90.0" )
1520
include( ${VTK_USE_FILE} )

‎src/Bridge/VtkGlue/VisualizeStaticDense2DLevelSetZeroSet/CMakeLists.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ project( VisualizeStaticDense2DLevelSetZeroSet )
55
find_package( ITK REQUIRED )
66
include( ${ITK_USE_FILE} )
77

8+
find_package(VTK REQUIRED)
9+
set(_vtk_prefix "")
10+
if(VTK_VERSION VERSION_LESS "8.90.0")
11+
set(_vtk_prefix "vtk")
12+
endif()
813
find_package( VTK REQUIRED
914
COMPONENTS
10-
vtkRenderingCore
11-
vtkRenderingGL2PSOpenGL2
15+
${_vtk_prefix}RenderingCore
16+
${_vtk_prefix}RenderingGL2PSOpenGL2
1217
)
1318
if( VTK_VERSION VERSION_LESS "8.90.0" )
1419
include( ${VTK_USE_FILE} )

‎src/Bridge/VtkGlue/VisualizeStaticMalcolm2DLevelSetLayers/CMakeLists.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ project( VisualizeStaticMalcolm2DLevelSetLayers )
55
find_package( ITK REQUIRED )
66
include( ${ITK_USE_FILE} )
77

8+
find_package(VTK REQUIRED)
9+
set(_vtk_prefix "")
10+
if(VTK_VERSION VERSION_LESS "8.90.0")
11+
set(_vtk_prefix "vtk")
12+
endif()
813
find_package( VTK REQUIRED
914
COMPONENTS
10-
vtkRenderingCore
11-
vtkRenderingGL2PSOpenGL2
15+
${_vtk_prefix}RenderingCore
16+
${_vtk_prefix}RenderingGL2PSOpenGL2
1217
)
1318
if( VTK_VERSION VERSION_LESS "8.90.0" )
1419
include( ${VTK_USE_FILE} )

‎src/Bridge/VtkGlue/VisualizeStaticShi2DLevelSetLayers/CMakeLists.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ project( VisualizeStaticShi2DLevelSetLayers )
55
find_package( ITK REQUIRED )
66
include( ${ITK_USE_FILE} )
77

8+
find_package(VTK REQUIRED)
9+
set(_vtk_prefix "")
10+
if(VTK_VERSION VERSION_LESS "8.90.0")
11+
set(_vtk_prefix "vtk")
12+
endif()
813
find_package( VTK REQUIRED
914
COMPONENTS
10-
vtkRenderingCore
11-
vtkRenderingGL2PSOpenGL2
15+
${_vtk_prefix}RenderingCore
16+
${_vtk_prefix}RenderingGL2PSOpenGL2
1217
)
1318
if( VTK_VERSION VERSION_LESS "8.90.0" )
1419
include( ${VTK_USE_FILE} )

‎src/Bridge/VtkGlue/VisualizeStaticWhitaker2DLevelSetLayers/CMakeLists.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,15 @@ project( VisualizeStaticWhitaker2DLevelSetLayers )
55
find_package( ITK REQUIRED )
66
include( ${ITK_USE_FILE} )
77

8+
find_package(VTK REQUIRED)
9+
set(_vtk_prefix "")
10+
if(VTK_VERSION VERSION_LESS "8.90.0")
11+
set(_vtk_prefix "vtk")
12+
endif()
813
find_package( VTK REQUIRED
914
COMPONENTS
10-
vtkRenderingCore
11-
vtkRenderingGL2PSOpenGL2
15+
${_vtk_prefix}RenderingCore
16+
${_vtk_prefix}RenderingGL2PSOpenGL2
1217
)
1318
if( VTK_VERSION VERSION_LESS "8.90.0" )
1419
include( ${VTK_USE_FILE} )

‎src/Core/Common/DisplayImage/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ include(${ITK_USE_FILE})
88
if(ENABLE_QUICKVIEW)
99
find_package( VTK REQUIRED
1010
COMPONENTS
11-
vtkRenderingCore
12-
vtkRenderingGL2PSOpenGL2
11+
${_vtk_prefix}RenderingCore
12+
${_vtk_prefix}RenderingGL2PSOpenGL2
1313
)
1414
if(VTK_VERSION VERSION_LESS "8.90.0")
1515
include(${VTK_USE_FILE})

‎src/Core/Common/FindMaxAndMinInImage/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ project(FindMaxAndMinInImage)
55
find_package(ITK REQUIRED)
66
include(${ITK_USE_FILE})
77

8+
find_package(VTK REQUIRED)
9+
set(_vtk_prefix "")
10+
if(VTK_VERSION VERSION_LESS "8.90.0")
11+
set(_vtk_prefix "vtk")
12+
endif()
813
find_package(VTK REQUIRED
914
COMPONENTS
10-
vtkInteractionImage
11-
vtkRenderingCore
12-
vtkRenderingGL2PSOpenGL2
15+
${_vtk_prefix}InteractionImage
16+
${_vtk_prefix}RenderingCore
17+
${_vtk_prefix}RenderingGL2PSOpenGL2
1318
)
1419
if(VTK_VERSION VERSION_LESS "8.90.0")
1520
include(${VTK_USE_FILE})

‎src/Core/Common/InPlaceFilterOfImage/CMakeLists.txt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ project(InPlaceFilterOfImage)
55
find_package(ITK REQUIRED)
66
include(${ITK_USE_FILE})
77

8+
find_package(VTK REQUIRED)
9+
set(_vtk_prefix "")
10+
if(VTK_VERSION VERSION_LESS "8.90.0")
11+
set(_vtk_prefix "vtk")
12+
endif()
813
find_package(VTK REQUIRED
914
COMPONENTS
10-
vtkInteractionImage
11-
vtkRenderingCore
12-
vtkRenderingGL2PSOpenGL2
15+
${_vtk_prefix}InteractionImage
16+
${_vtk_prefix}RenderingCore
17+
${_vtk_prefix}RenderingGL2PSOpenGL2
1318
)
1419
if(VTK_VERSION VERSION_LESS "8.90.0")
1520
include(${VTK_USE_FILE})

‎src/Core/Common/IterateLineThroughImage/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ include(${ITK_USE_FILE})
88
if(ENABLE_QUICKVIEW)
99
find_package( VTK REQUIRED
1010
COMPONENTS
11-
vtkRenderingCore
12-
vtkRenderingGL2PSOpenGL2
11+
${_vtk_prefix}RenderingCore
12+
${_vtk_prefix}RenderingGL2PSOpenGL2
1313
)
1414
if(VTK_VERSION VERSION_LESS "8.90.0")
1515
include(${VTK_USE_FILE})

0 commit comments

Comments
 (0)