From: guigues <guigues>
Date: Fri, 12 Dec 2008 10:20:17 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.2.0~14
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=2b15c3e2135b8d14cb1200dc4e3a60c41959c088;hp=3e4047eeecf615bb05f00b4caffd6fe0e16e4642;p=crea.git

*** empty log message ***
---

diff --git a/cmake/CREAMacro_FindAndUseLibraries.cmake b/cmake/CREAMacro_FindAndUseLibraries.cmake
index 2e5eeda..59b535c 100644
--- a/cmake/CREAMacro_FindAndUseLibraries.cmake
+++ b/cmake/CREAMacro_FindAndUseLibraries.cmake
@@ -48,6 +48,7 @@ IF(USE_ITK)
       MESSAGE ( STATUS "* Version = ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}")
       INCLUDE(${ITK_USE_FILE})
       CREA_DEFINE( USE_ITK )
+      CREA_DEFINE( _USE_ITK_ )
       SET(ITK_LIBRARIES
 	ITKCommon ITKIO ITKBasicFilters ITKAlgorithms
 	)  
diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index 72871e0..2cfe107 100644
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -21,8 +21,10 @@ 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)