X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseVTK.cmake;h=7224685dafd9ed3ee13d190dd63c9cfc105d46ad;hb=32cf249030f4b167f85663503920b29874beda9f;hp=a4d87fcccfa1e8ecf9aba01373cf115867a8937c;hpb=625781f41f73eecb946d688b8037bd2cb47db74f;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index a4d87fc..7224685 100644
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -1,7 +1,7 @@
 # ---------------------------------------------------------------------
 #
 # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
+#                        pour la Sant�
 # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
 # Previous Authors : Laurent Guigues, Jean-Pierre Roux
 # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
@@ -30,7 +30,9 @@ MACRO(CREA_FIND_AND_USE_VTK)
     # Search VTK
 	message("DFCH--VTK: CREAMacro_FindAndUseVTK.cmake: " ${CMAKE_CURRENT_LIST_FILE})
 	message("DFCH--VTK: CREAMacro_FindAndUseVTK.cmake: " ${_IMPORT_PREFIX})
+    
     FIND_PACKAGE(VTK)
+    
     # If vtk found
     IF(VTK_FOUND)
 
@@ -38,9 +40,12 @@ MACRO(CREA_FIND_AND_USE_VTK)
       MESSAGE ( STATUS "Looking for VTK... found")
       MESSAGE ( STATUS "* Dir     = ${VTK_DIR}")
       MESSAGE ( STATUS "* Version = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
-      SET(VTK_BUILD_SETTINGS_FILE OFF)      
-	INCLUDE(${VTK_USE_FILE})
-	LINK_DIRECTORIES(${VTK_DIR}) #DFCH -- 16/7/2012
+      SET(VTK_BUILD_SETTINGS_FILE OFF)
+      
+## EED 2022-07-21
+##	INCLUDE(${VTK_USE_FILE})
+##	LINK_DIRECTORIES(${VTK_DIR}) #DFCH -- 16/7/2012
+INCLUDE_DIRECTORIES(include ${VTK_INCLUDE_DIRS} )
 
 	IF(VTK_USE_GL2PS)
            	add_definitions(-DUSE_WXGLCANVAS)
@@ -51,6 +56,7 @@ MACRO(CREA_FIND_AND_USE_VTK)
     		#MESSAGE("${GTK2_INCLUDE_DIRS}")
     		INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
     		LINK_LIBRARIES(${GTK2_LIBRARIES})
+message("EED CREAMacro_FindAndUseVTK.cmake  GTK2_VERSION "${GTK2_VERSION} )
     		# Can I require all my user to have the gl lib on linux, even if they do not really need it...
     		SET(WXGLCANVASLIBS "gl")
 	ENDIF(VTK_USE_GL2PS)  
@@ -82,125 +88,145 @@ ENDIF("${VTK_MAJOR_VERSION}" LESS 6)
 
 
 ##EED 2017-01-01 Migration VTK7
-IF("${VTK_MAJOR_VERSION}" GREATER 5)
-	SET(VTK_LIBRARIES
-	    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)
+#IF("${VTK_MAJOR_VERSION}" GREATER 5)
+#	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         
+#	    vtkDICOMParser                  
+#	    vtkFiltersStatistics       
+#	    vtkInteractionImage      
+#	    vtkIOXML           
+#	    vtkRenderingVolume
+#	    vtkDomainsChemistry             
+#	    vtkFiltersTexture          
+#	    vtkInteractionStyle      
+#	    vtkIOXMLParser     
+#	    vtkFiltersVerdict          
+#	    vtkInteractionWidgets    
+#	    vtkjpeg            
+#	    vtksqlite
+#	    vtkexoIIc                       
+#	    vtkfreetype                
+#	    vtkIOAMR                 
+#	    vtkjsoncpp         
+#	    vtksys
+#	    vtkexpat                        
+#	    vtkGeovisCore              
+#	    vtkIOCore                
+#	    vtklibxml2         
+#	    vtktiff
+#	    vtkFiltersAMR                   
+#	    vtkgl2ps                   
+#	    vtkIOEnSight             
+#	    vtkmetaio          
+##	    vtkverdict
+#	    vtkFiltersCore                  
+#	    vtkIOExodus              
+#	    vtkNetCDF          
+#	    vtkViewsContext2D
+#	    vtkFiltersExtraction            
+#	    vtkIOExport              
+#	    vtkViewsCore
+#	    vtkFiltersFlowPaths             
+#	    vtkIOGeometry            
+#	    vtkoggtheora       
+#	    vtkViewsGeovis
+#	    vtkFiltersGeneral               
+#	    vtkhdf5                    
+#	    vtkIOImage               
+#	    vtkParallelCore    
+#	    vtkViewsInfovis
+#	    vtkFiltersGeneric               
+#	    vtkhdf5_hl                 
+#	    vtkIOImport              
+#	    vtkpng             
+#	    vtkFiltersGeometry              
+#	    vtkImagingColor            
+#	    vtkIOInfovis             
+#	    vtkproj4               
+#	    vtkzlib
+#
+##	    vtkRenderingVolumeOpenGL
+##	    vtkRenderingOpenGL
+##	    vtkRenderingGL2PS
+##	    vtkRenderingContextOpenGL
+#
+#	    vtkglew                    
+#	    vtkRenderingVolumeOpenGL2
+#	    vtkDomainsChemistryOpenGL2      
+#	    vtkRenderingOpenGL2
+#	    vtkRenderingGL2PSOpenGL2
+#	    vtkRenderingContextOpenGL2
+#	)
+	IF (WIN32)
+#   	  SET(VTK_LIBRARIES ${VTK_LIBRARIES} )
+    ELSE(WIN32)
+#   	  SET(VTK_LIBRARIES ${VTK_LIBRARIES}
+#	    vtkRenderingQt
+#	    vtkGUISupportQt            
+#	    vtkGUISupportQtSQL         
+#	    vtkViewsQt
+#	    vtkNetCDF_cxx      	
+#		)
+    
+	ENDIF(WIN32)
+	
+
+  IF(VTK_USE_TDX)
+	SET(VTK_LIBRARIES ${VTK_LIBRARIES}  vtkRenderingTDx )
+  ENDIF(VTK_USE_TDX)
+
+	
+# ENDIF("${VTK_MAJOR_VERSION}" GREATER 5)
 
 
       	MARK_AS_ADVANCED(VTK_DIR)