X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FCREAMacro_FindAndUseVTK.cmake;h=ed9391233af64c0568362047b07b31a0f6f0256f;hb=a0aee773948a586f465e01eba6095062779779e0;hp=e7a71a89c527da9e596221a3b1f76fd63994c168;hpb=3ee02e64d4c72d46fbbe224e7cd50ebd880a9240;p=crea.git

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index e7a71a8..ed93912 100644
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -1,15 +1,60 @@
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        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
+#
+#  This software is governed by the CeCILL-B license under French law and 
+#  abiding by the rules of distribution of free software. You can  use, 
+#  modify and/ or redistribute the software under the terms of the CeCILL-B 
+#  license as circulated by CEA, CNRS and INRIA at the following URL 
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability. 
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */ 
+
+
 MACRO(CREA_FIND_AND_USE_VTK)
   #---------------------------------------------------------------------------
   IF(NOT VTK_FOUND)
     # 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)
+
       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})
+	LINK_DIRECTORIES(${VTK_DIR}) #DFCH -- 16/7/2012
+
+	IF(VTK_USE_GL2PS)
+           	add_definitions(-DUSE_WXGLCANVAS)
+	  	# CMake 2.6:
+		# technically those packages are not required since one can still use the Motif/X11 version and not the gtk one:
+    		FIND_PACKAGE(PkgConfig)
+    		pkg_check_modules (GTK2 gtk+-2.0)
+    		#MESSAGE("${GTK2_INCLUDE_DIRS}")
+    		INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
+    		LINK_LIBRARIES(${GTK2_LIBRARIES})
+    		# 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)  
+
       CREA_DEFINE( USE_VTK )
       CREA_DEFINE( _USE_VTK_ )
       SET(VTK_LIBRARIES
@@ -24,8 +69,8 @@ MACRO(CREA_FIND_AND_USE_VTK)
 	vtkGenericFiltering
 	vtkHybrid
 #	vtkInfovis
-	vtkViews
-	) 
+#	vtkViews
+	)
       IF(NOT USE_ITK)
 	SET(VTK_LIBRARIES ${VTK_LIBRARIES} vtkIO)
       ENDIF(NOT USE_ITK)