X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseVTK.cmake;h=018187ef941c8f5f9ecb413a4f6b4822011119d9;hb=70ae3bca8b87c45d33b75bb82b6523f2e46c9bc8;hp=578afb5b03fb76241d95c128008e75d6202c66a4;hpb=ca800a1a9a78f119d37d9642ea29acb7c9b9a323;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index 578afb5..018187e 100644
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -28,8 +28,8 @@ MACRO(CREA_FIND_AND_USE_VTK)
   #---------------------------------------------------------------------------
   IF(NOT VTK_FOUND)
     # Search VTK
-	message("DFCH--VTK: CREAMacro_FindAndUseVTK.cmake: "${CMAKE_CURRENT_LIST_FILE})
-	message("DFCH--VTK: CREAMacro_FindAndUseVTK.cmake: "${_IMPORT_PREFIX})
+	message("DFCH--VTK: CREAMacro_FindAndUseVTK.cmake: " ${CMAKE_CURRENT_LIST_FILE})
+	message("DFCH--VTK: CREAMacro_FindAndUseVTK.cmake: " ${_IMPORT_PREFIX})
     FIND_PACKAGE(VTK)
     # If vtk found
     IF(VTK_FOUND)
@@ -57,24 +57,160 @@ 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)
+
+ENDIF("${VTK_MAJOR_VERSION}" LESS 6)
+
+
+##EED 2017-01-01 Migration VTK7
+IF("${VTK_MAJOR_VERSION}" GREATER 5)
+	SET(VTK_LIBRARIES
+	    vtkalglib                       
+	    vtkFiltersHybrid           
+	    vtkImagingCore           
+	    vtkIOLegacy        
+	    vtkRenderingAnnotation
+	    vtkChartsCore
+	    vtkFiltersHyperTree        
+	    vtkImagingFourier        
+	    vtkIOLSDyna        
+	    vtkRenderingContext2D
+	    vtkCommonColor                  
+	    vtkFiltersImaging          
+	    vtkImagingGeneral        
+	    vtkIOMINC          
+	    vtkCommonComputationalGeometry  
+	    vtkFiltersModeling         
+	    vtkImagingHybrid         
+	    vtkIOMovie         
+	    vtkRenderingCore
+	    vtkCommonCore                   
+	    vtkFiltersParallel         
+	    vtkImagingMath           
+	    vtkIONetCDF        
+	    vtkRenderingFreeType
+	    vtkCommonDataModel              
+	    vtkFiltersParallelImaging  
+	    vtkImagingMorphological  
+	    vtkIOParallel      
+	    vtkCommonExecutionModel         
+	    vtkFiltersPoints           
+	    vtkImagingSources        
+	    vtkIOParallelXML   
+	    vtkRenderingImage
+	    vtkCommonMath                   
+	    vtkFiltersProgrammable     
+	    vtkImagingStatistics     
+	    vtkIOPLY           
+	    vtkRenderingLabel
+	    vtkCommonMisc                   
+	    vtkFiltersSelection        
+	    vtkImagingStencil        
+	    vtkIOSQL           
+	    vtkRenderingLOD
+	    vtkCommonSystem                 
+	    vtkFiltersSMP              
+	    vtkInfovisCore           
+	    vtkIOTecplotTable  
+	    vtkCommonTransforms             
+	    vtkFiltersSources          
+	    vtkInfovisLayout         
+	    vtkIOVideo         
+	    vtkRenderingQt
+	    vtkDICOMParser                  
+	    vtkFiltersStatistics       
+	    vtkInteractionImage      
+	    vtkIOXML           
+	    vtkRenderingVolume
+	    vtkDomainsChemistry             
+	    vtkFiltersTexture          
+	    vtkInteractionStyle      
+	    vtkIOXMLParser     
+	    vtkFiltersVerdict          
+	    vtkInteractionWidgets    
+	    vtkjpeg            
+	    vtksqlite
+	    vtkexoIIc                       
+	    vtkfreetype                
+	    vtkIOAMR                 
+	    vtkjsoncpp         
+	    vtksys
+	    vtkexpat                        
+	    vtkGeovisCore              
+	    vtkIOCore                
+	    vtklibxml2         
+	    vtktiff
+	    vtkFiltersAMR                   
+	    vtkgl2ps                   
+	    vtkIOEnSight             
+	    vtkmetaio          
+#	    vtkverdict
+	    vtkFiltersCore                  
+	    vtkIOExodus              
+	    vtkNetCDF          
+	    vtkViewsContext2D
+	    vtkFiltersExtraction            
+	    vtkGUISupportQt            
+	    vtkIOExport              
+	    vtkNetCDF_cxx      
+	    vtkViewsCore
+	    vtkFiltersFlowPaths             
+	    vtkGUISupportQtSQL         
+	    vtkIOGeometry            
+	    vtkoggtheora       
+	    vtkViewsGeovis
+	    vtkFiltersGeneral               
+	    vtkhdf5                    
+	    vtkIOImage               
+	    vtkParallelCore    
+	    vtkViewsInfovis
+	    vtkFiltersGeneric               
+	    vtkhdf5_hl                 
+	    vtkIOImport              
+	    vtkpng             
+	    vtkViewsQt
+	    vtkFiltersGeometry              
+	    vtkImagingColor            
+	    vtkIOInfovis             
+	    vtkproj4               
+	    vtkzlib
+
+#	    vtkRenderingVolumeOpenGL
+#	    vtkRenderingOpenGL
+#	    vtkRenderingGL2PS
+#	    vtkRenderingContextOpenGL
+
+	    vtkglew                    
+	    vtkRenderingVolumeOpenGL2
+	    vtkDomainsChemistryOpenGL2      
+	    vtkRenderingOpenGL2
+	    vtkRenderingGL2PSOpenGL2
+	    vtkRenderingContextOpenGL2
+
 	)
-      IF(NOT USE_ITK)
-	SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
-      ENDIF(NOT USE_ITK)
-      MARK_AS_ADVANCED(VTK_DIR)
+ENDIF("${VTK_MAJOR_VERSION}" GREATER 5)
+
+
+      	MARK_AS_ADVANCED(VTK_DIR)
     ELSE(VTK_FOUND)
       message(FATAL_ERROR "VTK_DIR not found")
     ENDIF(VTK_FOUND)