#3106 crea Bug New Normal - branch vtk7itk4 compilation with vtk7

[crea.git] / cmake / CREAMacro_FindAndUseVTK.cmake

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index ed9391233af64c0568362047b07b31a0f6f0256f..9ac483ff6a96166cdb061f5b265b318eaf1306d6 100644 (file)
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -57,24 +57,48 @@ MACRO(CREA_FIND_AND_USE_VTK)
 
       CREA_DEFINE( USE_VTK )
       CREA_DEFINE( _USE_VTK_ )
-      SET(VTK_LIBRARIES
-       vtkCommon     # Mandatory
-       vtkFiltering  # vtkImageData
-       vtkRendering  # vtkProp3D
-       vtkWidgets    # vtkImagePlaneWidget
-       vtkIO         # vtkMetaImageReader/Writer
-       vtkImaging    # filters such as vtkImageAnisotropicDiffusion3D
-       vtkGraphics   # vtkContourFilter, sources
-       vtkVolumeRendering # Mappers 
-       vtkGenericFiltering
-       vtkHybrid
-#      vtkInfovis
-#      vtkViews
+
+##EED 2017-01-01 Migration VTK7
+IF("${VTK_MAJOR_VERSION}" LESS 6)
+       SET(VTK_LIBRARIES
+               vtkCommon     # Mandatory
+               vtkFiltering  # vtkImageData
+               vtkRendering  # vtkProp3D
+               vtkWidgets    # vtkImagePlaneWidget
+               vtkIO         # vtkMetaImageReader/Writer
+               vtkImaging    # filters such as vtkImageAnisotropicDiffusion3D
+               vtkGraphics   # vtkContourFilter, sources
+               vtkVolumeRendering # Mappers 
+               vtkGenericFiltering
+               vtkHybrid
+#              vtkInfovis
+#              vtkViews
        )
-      IF(NOT USE_ITK)
-       SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
-      ENDIF(NOT USE_ITK)
-      MARK_AS_ADVANCED(VTK_DIR)
+       IF(NOT USE_ITK)
+               SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
+    ENDIF(NOT USE_ITK)
+
+ENDIF("${VTK_MAJOR_VERSION}" LESS 6)
+
+
+##EED 2017-01-01 Migration VTK7
+IF("${VTK_MAJOR_VERSION}" GREATER 5)
+       SET(VTK_LIBRARIES
+               vtkCommonCore
+               vtkCommonExecutionModel
+               vtkIOImage
+               vtkRenderingCore
+               vtkInteractionStyle
+        vtkImagingCore
+               vtkRenderingFreeType
+               vtkRenderingOpenGL2
+               vtkIOLegacy
+               vtkInteractionImage
+       )
+ENDIF("${VTK_MAJOR_VERSION}" GREATER 5)
+
+
+       MARK_AS_ADVANCED(VTK_DIR)
     ELSE(VTK_FOUND)
       message(FATAL_ERROR "VTK_DIR not found")
     ENDIF(VTK_FOUND)