#3204 crea Feature New Normal branch mingw64

[crea.git] / cmake / CREAMacro_FindAndUseVTK.cmake

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index a4d87fcccfa1e8ecf9aba01373cf115867a8937c..dd6db4c3e39d81891454f478002b2c8072fe0122 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,12 +131,10 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkFiltersSMP              
            vtkInfovisCore           
            vtkIOTecplotTable  
-           vtkRenderingOpenGL2
            vtkCommonTransforms             
            vtkFiltersSources          
            vtkInfovisLayout         
            vtkIOVideo         
-           vtkRenderingQt
            vtkDICOMParser                  
            vtkFiltersStatistics       
            vtkInteractionImage      
@@ -148,8 +144,6 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkFiltersTexture          
            vtkInteractionStyle      
            vtkIOXMLParser     
-           vtkRenderingVolumeOpenGL2
-           vtkDomainsChemistryOpenGL2      
            vtkFiltersVerdict          
            vtkInteractionWidgets    
            vtkjpeg            
@@ -170,17 +164,13 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkmetaio          
 #          vtkverdict
            vtkFiltersCore                  
-           vtkglew                    
            vtkIOExodus              
            vtkNetCDF          
            vtkViewsContext2D
            vtkFiltersExtraction            
-           vtkGUISupportQt            
            vtkIOExport              
-           vtkNetCDF_cxx      
            vtkViewsCore
            vtkFiltersFlowPaths             
-           vtkGUISupportQtSQL         
            vtkIOGeometry            
            vtkoggtheora       
            vtkViewsGeovis
@@ -193,13 +183,43 @@ IF("${VTK_MAJOR_VERSION}" GREATER 5)
            vtkhdf5_hl                 
            vtkIOImport              
            vtkpng             
-           vtkViewsQt
            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)