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

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index a4d87fcccfa1e8ecf9aba01373cf115867a8937c..18da18469035a2b6c958f867ff409f94478ad8e1 100644 (file)
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -98,7 +98,6 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkFiltersImaging          
            vtkImagingGeneral        
            vtkIOMINC          
-           vtkRenderingContextOpenGL2
            vtkCommonComputationalGeometry  
            vtkFiltersModeling         
            vtkImagingHybrid         
@@ -113,7 +112,6 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkFiltersParallelImaging  
            vtkImagingMorphological  
            vtkIOParallel      
-           vtkRenderingGL2PSOpenGL2
            vtkCommonExecutionModel         
            vtkFiltersPoints           
            vtkImagingSources        
@@ -133,7 +131,6 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkFiltersSMP              
            vtkInfovisCore           
            vtkIOTecplotTable  
-           vtkRenderingOpenGL2
            vtkCommonTransforms             
            vtkFiltersSources          
            vtkInfovisLayout         
@@ -148,8 +145,6 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkFiltersTexture          
            vtkInteractionStyle      
            vtkIOXMLParser     
-           vtkRenderingVolumeOpenGL2
-           vtkDomainsChemistryOpenGL2      
            vtkFiltersVerdict          
            vtkInteractionWidgets    
            vtkjpeg            
@@ -170,7 +165,6 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkmetaio          
 #          vtkverdict
            vtkFiltersCore                  
-           vtkglew                    
            vtkIOExodus              
            vtkNetCDF          
            vtkViewsContext2D
@@ -199,6 +193,19 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkIOInfovis             
            vtkproj4               
            vtkzlib
+
+#          vtkglew                    
+#          vtkRenderingVolumeOpenGL2
+#          vtkDomainsChemistryOpenGL2      
+#          vtkRenderingOpenGL2
+#          vtkRenderingGL2PSOpenGL2
+#          vtkRenderingContextOpenGL2
+
+           vtkRenderingVolumeOpenGL
+           vtkRenderingOpenGL
+           vtkRenderingGL2PS
+           vtkRenderingContextOpenGL
+
        )
 ENDIF("${VTK_MAJOR_VERSION}" GREATER 5)