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

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index b0fdf26a29f2919c197ddf4b2f96b97b6cc8c437..a4d87fcccfa1e8ecf9aba01373cf115867a8937c 100644 (file)
--- 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)