X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=cmake%2FCREAMacro_FindAndUseVTK.cmake;h=7224685dafd9ed3ee13d190dd63c9cfc105d46ad;hb=fd0540f50c983b55494f9dbe67448ffb10f869fe;hp=7d1518c6d9573de59218aedc012cfdefe953834b;hpb=0ec2144d3569d045ee5dfe886e3db723f400225a;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index 7d1518c..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,7 +56,6 @@ 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_INCLUDE_DIRS "${GTK2_INCLUDE_DIRS} )
 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")
@@ -204,17 +208,23 @@ ENDIF("${VTK_MAJOR_VERSION}" LESS 6)
 #	    vtkRenderingContextOpenGL2
 #	)
 	IF (WIN32)
-   	  SET(VTK_LIBRARIES ${VTK_LIBRARIES} )
+#   	  SET(VTK_LIBRARIES ${VTK_LIBRARIES} )
     ELSE(WIN32)
-   	  SET(VTK_LIBRARIES ${VTK_LIBRARIES} 
+#   	  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)