X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseVTK.cmake;h=dd6db4c3e39d81891454f478002b2c8072fe0122;hb=ad0282622fc7ae88e2c844842a415968f1de10fe;hp=30b00e6742e8453dfc1702358d0e1569136c611e;hpb=4a9eabd4f407bc347950f94f35b3e95c374a0375;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index 30b00e6..dd6db4c 100644
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -84,45 +84,142 @@ ENDIF("${VTK_MAJOR_VERSION}" LESS 6)
 ##EED 2017-01-01 Migration VTK7
 IF("${VTK_MAJOR_VERSION}" GREATER 5)
 	SET(VTK_LIBRARIES
-		vtkCommonCore
-		vtkCommonColor
-		vtkCommonExecutionModel
-		vtkCommonSystem
-		vtktiff
-		vtkjpeg
-		vtkpng
-		vtkDICOMParser
-		vtkmetaio
-		vtkIOImage
-		vtkFiltersGeometry
-		vtkCommonComputationalGeometry
-		vtkRenderingCore
-		vtkFiltersSources
-		vtkInteractionStyle
-		vtkalglib
-		vtkImagingFourier
-		vtkFiltersStatistics
-		vtkFiltersExtraction
-        vtkImagingCore
-		vtkRenderingFreeType
-		vtksys
-		vtkRenderingOpenGL2
-		vtkIOLegacy
-		vtkImagingColor
-		vtkImagingSources
-		vtkFiltersHybrid
-		vtkFiltersModeling
-		vtkImagingGeneral
-		vtkImagingHybrid
-		vtkexpat
-		vtkIOXMLParser
-		vtkIOXML
-		vtkRenderingVolume
-		vtkInteractionWidgets
-		vtkRenderingAnnotation
-		vtkInteractionImage
-		vtkglew
+	    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         
+	    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            
+	    vtkIOExport              
+	    vtkViewsCore
+	    vtkFiltersFlowPaths             
+	    vtkIOGeometry            
+	    vtkoggtheora       
+	    vtkViewsGeovis
+	    vtkFiltersGeneral               
+	    vtkhdf5                    
+	    vtkIOImage               
+	    vtkParallelCore    
+	    vtkViewsInfovis
+	    vtkFiltersGeneric               
+	    vtkhdf5_hl                 
+	    vtkIOImport              
+	    vtkpng             
+	    vtkFiltersGeometry              
+	    vtkImagingColor            
+	    vtkIOInfovis             
+	    vtkproj4               
+	    vtkzlib
+
+#	    vtkRenderingVolumeOpenGL
+#	    vtkRenderingOpenGL
+#	    vtkRenderingGL2PS
+#	    vtkRenderingContextOpenGL
+
+	    vtkglew                    
+	    vtkRenderingVolumeOpenGL2
+	    vtkDomainsChemistryOpenGL2      
+	    vtkRenderingOpenGL2
+	    vtkRenderingGL2PSOpenGL2
+	    vtkRenderingContextOpenGL2
+
+#	    vtkRenderingQt
+#	    vtkGUISupportQt            
+#	    vtkGUISupportQtSQL         
+#	    vtkViewsQt
+#	    vtkNetCDF_cxx      
 	)
+	IF (WIN32)
+   	  SET(VTK_LIBRARIES ${VTK_LIBRARIES} )
+    ELSE(WIN32)
+   	  SET(VTK_LIBRARIES ${VTK_LIBRARIES} 
+	    vtkRenderingQt
+	    vtkGUISupportQt            
+	    vtkGUISupportQtSQL         
+	    vtkViewsQt
+	    vtkNetCDF_cxx      	
+		)
+	ENDIF(WIN32)
+	
+	
 ENDIF("${VTK_MAJOR_VERSION}" GREATER 5)