From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Tue, 8 Aug 2017 06:59:30 +0000 (+0200)
Subject: #3106 crea Bug New Normal  -  branch vtk7itk4 compilation with vtk7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=625781f41f73eecb946d688b8037bd2cb47db74f;p=crea.git

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

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index b0fdf26..a4d87fc 100644
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -84,165 +84,121 @@ 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
-		vtkIOGeometry
-		vtkFiltersGeometry
-		vtkCommonComputationalGeometry
-		vtkRenderingCore
-		vtkFiltersSources
-		vtkInteractionStyle
-		vtkalglib
-		vtkImagingFourier
-		vtkFiltersStatistics
-		vtkFiltersExtraction
-		vtkImagingCore
-		vtkRenderingFreeType
-		vtksys
-		vtkRenderingOpenGL2
-		vtkRenderingVolumeOpenGL2
-		vtkRenderingGL2PSOpenGL2
-		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          
-    vtkRenderingContextOpenGL2
-    vtkCommonComputationalGeometry  
-    vtkFiltersModeling         
-    vtkImagingHybrid         
-    vtkIOMovie         
-    vtkRenderingCore
-    vtkCommonCore                   
-    vtkFiltersParallel         
-    vtkImagingMath           
-    vtkIONetCDF        
-    vtkRenderingFreeType
-    vtkCommonDataModel              
-    vtkFiltersParallelImaging  
-    vtkImagingMorphological  
-    vtkIOParallel      
-    vtkRenderingGL2PSOpenGL2
-    vtkCommonExecutionModel         
-    vtkFiltersPoints           
-    vtkImagingSources        
-    vtkIOParallelXML   
-    vtkRenderingImage
-    vtkCommonMath                   
-    vtkFiltersProgrammable     
-    vtkImagingStatistics     
-    vtkIOPLY           
-    vtkRenderingLabel
-    vtkCommonMisc                   
-    vtkFiltersSelection        
-    vtkImagingStencil        
-    vtkIOSQL           
-    vtkRenderingLOD
-    vtkCommonSystem                 
-    vtkFiltersSMP              
-    vtkInfovisCore           
-    vtkIOTecplotTable  
-    vtkRenderingOpenGL2
-    vtkCommonTransforms             
-    vtkFiltersSources          
-    vtkInfovisLayout         
-    vtkIOVideo         
-    vtkRenderingQt
-    vtkDICOMParser                  
-    vtkFiltersStatistics       
-    vtkInteractionImage      
-    vtkIOXML           
-    vtkRenderingVolume
-    vtkDomainsChemistry             
-    vtkFiltersTexture          
-    vtkInteractionStyle      
-    vtkIOXMLParser     
-    vtkRenderingVolumeOpenGL2
-    vtkDomainsChemistryOpenGL2      
-    vtkFiltersVerdict          
-    vtkInteractionWidgets    
-    vtkjpeg            
-    vtksqlite
-    vtkexoIIc                       
-    vtkfreetype                
-    vtkIOAMR                 
-    vtkjsoncpp         
-    vtksys
-    vtkexpat                        
-    vtkGeovisCore              
-    vtkIOCore                
-    vtklibxml2         
-    vtktiff
-    vtkFiltersAMR                   
-    vtkgl2ps                   
-    vtkIOEnSight             
-    vtkmetaio          
-#    vtkverdict
-    vtkFiltersCore                  
-    vtkglew                    
-    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
-
-
+	    vtkalglib                       
+	    vtkFiltersHybrid           
+	    vtkImagingCore           
+	    vtkIOLegacy        
+	    vtkRenderingAnnotation
+	    vtkChartsCore
+	    vtkFiltersHyperTree        
+	    vtkImagingFourier        
+	    vtkIOLSDyna        
+	    vtkRenderingContext2D
+	    vtkCommonColor                  
+	    vtkFiltersImaging          
+	    vtkImagingGeneral        
+	    vtkIOMINC          
+	    vtkRenderingContextOpenGL2
+	    vtkCommonComputationalGeometry  
+	    vtkFiltersModeling         
+	    vtkImagingHybrid         
+	    vtkIOMovie         
+	    vtkRenderingCore
+	    vtkCommonCore                   
+	    vtkFiltersParallel         
+	    vtkImagingMath           
+	    vtkIONetCDF        
+	    vtkRenderingFreeType
+	    vtkCommonDataModel              
+	    vtkFiltersParallelImaging  
+	    vtkImagingMorphological  
+	    vtkIOParallel      
+	    vtkRenderingGL2PSOpenGL2
+	    vtkCommonExecutionModel         
+	    vtkFiltersPoints           
+	    vtkImagingSources        
+	    vtkIOParallelXML   
+	    vtkRenderingImage
+	    vtkCommonMath                   
+	    vtkFiltersProgrammable     
+	    vtkImagingStatistics     
+	    vtkIOPLY           
+	    vtkRenderingLabel
+	    vtkCommonMisc                   
+	    vtkFiltersSelection        
+	    vtkImagingStencil        
+	    vtkIOSQL           
+	    vtkRenderingLOD
+	    vtkCommonSystem                 
+	    vtkFiltersSMP              
+	    vtkInfovisCore           
+	    vtkIOTecplotTable  
+	    vtkRenderingOpenGL2
+	    vtkCommonTransforms             
+	    vtkFiltersSources          
+	    vtkInfovisLayout         
+	    vtkIOVideo         
+	    vtkRenderingQt
+	    vtkDICOMParser                  
+	    vtkFiltersStatistics       
+	    vtkInteractionImage      
+	    vtkIOXML           
+	    vtkRenderingVolume
+	    vtkDomainsChemistry             
+	    vtkFiltersTexture          
+	    vtkInteractionStyle      
+	    vtkIOXMLParser     
+	    vtkRenderingVolumeOpenGL2
+	    vtkDomainsChemistryOpenGL2      
+	    vtkFiltersVerdict          
+	    vtkInteractionWidgets    
+	    vtkjpeg            
+	    vtksqlite
+	    vtkexoIIc                       
+	    vtkfreetype                
+	    vtkIOAMR                 
+	    vtkjsoncpp         
+	    vtksys
+	    vtkexpat                        
+	    vtkGeovisCore              
+	    vtkIOCore                
+	    vtklibxml2         
+	    vtktiff
+	    vtkFiltersAMR                   
+	    vtkgl2ps                   
+	    vtkIOEnSight             
+	    vtkmetaio          
+#	    vtkverdict
+	    vtkFiltersCore                  
+	    vtkglew                    
+	    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
 	)
 ENDIF("${VTK_MAJOR_VERSION}" GREATER 5)