#3169 creaFeature New Normal - branch vtk7itk4wx3-mxecc

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index 018187ef941c8f5f9ecb413a4f6b4822011119d9..e8c055716a95969bbd2a1265a22ef55f3e7c333a 100644 (file)
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -78,11 +78,139 @@ IF("${VTK_MAJOR_VERSION}" LESS 6)
                SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
     ENDIF(NOT USE_ITK)
 
-ENDIF("${VTK_MAJOR_VERSION}" LESS 6)
+ENDIF( ("${VTK_MAJOR_VERSION}" GREATER 5) AND ("${VTK_MAJOR_VERSION}" LESS 8) )
 
 
 ##EED 2017-01-01 Migration VTK7
-IF("${VTK_MAJOR_VERSION}" GREATER 5)
+IF( ("${VTK_MAJOR_VERSION}" GREATER 7) AND ("${VTK_MAJOR_VERSION}" LESS 9) )
+       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         
+#vtk8      vtktiff
+           vtkFiltersAMR                   
+           vtkgl2ps                   
+           vtkIOEnSight             
+           vtkmetaio          
+#          vtkverdict
+           vtkFiltersCore                  
+           vtkIOExodus              
+           vtkNetCDF          
+           vtkViewsContext2D
+           vtkFiltersExtraction            
+           vtkGUISupportQt            
+           vtkIOExport              
+#vtk8      vtkNetCDF_cxx      
+           vtkViewsCore
+           vtkFiltersFlowPaths             
+           vtkGUISupportQtSQL         
+           vtkIOGeometry            
+#vtk8      vtkoggtheora       
+#vtk8      vtkViewsGeovis
+           vtkFiltersGeneral               
+#vtk8      vtkhdf5                    
+           vtkIOImage               
+           vtkParallelCore    
+           vtkViewsInfovis
+           vtkFiltersGeneric               
+#vtk8      vtkhdf5_hl                 
+           vtkIOImport              
+           vtkpng             
+           vtkViewsQt
+           vtkFiltersGeometry              
+           vtkImagingColor            
+           vtkIOInfovis             
+           vtkproj4               
+           vtkzlib
+
+#          vtkRenderingVolumeOpenGL
+#          vtkRenderingOpenGL
+#          vtkRenderingGL2PS
+#          vtkRenderingContextOpenGL
+
+#vtk8      vtkglew                    
+           vtkRenderingVolumeOpenGL2
+           vtkDomainsChemistryOpenGL2      
+           vtkRenderingOpenGL2
+           vtkRenderingGL2PSOpenGL2
+           vtkRenderingContextOpenGL2
+
+       )
+ENDIF("${VTK_MAJOR_VERSION}" GREATER 5)
+
+##EED 2017-01-01 Migration VTK7
+IF( ("${VTK_MAJOR_VERSION}" GREATER 5) AND ("${VTK_MAJOR_VERSION}" LESS 8) )
        SET(VTK_LIBRARIES
            vtkalglib                       
            vtkFiltersHybrid           
@@ -210,6 +338,7 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
 ENDIF("${VTK_MAJOR_VERSION}" GREATER 5)
 
 
+
        MARK_AS_ADVANCED(VTK_DIR)
     ELSE(VTK_FOUND)
       message(FATAL_ERROR "VTK_DIR not found")