X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseVTK.cmake;h=50dfe5b2862aab07e48db23e5f417795f9da19a0;hb=41e6b6003e71b53e28c72925442eaec6469c736e;hp=a15d0f57eaafe6d3ff4d752941b4b1f19a5a1c05;hpb=0d9b01fc0a92aad82fa601c36952ffb2a89d5bbb;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index a15d0f5..50dfe5b 100644
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -5,12 +5,17 @@ MACRO(CREA_FIND_AND_USE_VTK)
     FIND_PACKAGE(VTK)
     # If vtk found
     IF(VTK_FOUND)
+
       MESSAGE ( STATUS "=======================================")
       MESSAGE ( STATUS "Looking for VTK... found")
       MESSAGE ( STATUS "* Dir     = ${VTK_DIR}")
       MESSAGE ( STATUS "* Version = ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION}")
-      INCLUDE(${VTK_USE_FILE})
+      SET(VTK_BUILD_SETTINGS_FILE OFF)      
+	INCLUDE(${VTK_USE_FILE})
+
+
       CREA_DEFINE( USE_VTK )
+      CREA_DEFINE( _USE_VTK_ )
       SET(VTK_LIBRARIES
 	vtkCommon     # Mandatory
 	vtkFiltering  # vtkImageData
@@ -20,9 +25,11 @@ MACRO(CREA_FIND_AND_USE_VTK)
 	vtkImaging    # filters such as vtkImageAnisotropicDiffusion3D
 	vtkGraphics   # vtkContourFilter, sources
 	vtkVolumeRendering # Mappers 
-	#      vtkGenericFiltering
-	# LG : removed vtkIO because conflict with itktiff lib in ITKIO  ??
-	) 
+	vtkGenericFiltering
+	vtkHybrid
+#	vtkInfovis
+#	vtkViews
+	)
       IF(NOT USE_ITK)
 	SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
       ENDIF(NOT USE_ITK)