From: Diego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Date: Mon, 16 Jul 2012 10:05:54 +0000 (+0000)
Subject: DFCH: Find vtk lib path
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7a190c36c11fdd1f49f421b32cdf01636afeffc1;p=crea.git

DFCH: Find vtk lib path
---

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index 751426a..aee215f 100644
--- a/cmake/CREAMacro_FindAndUseVTK.cmake
+++ b/cmake/CREAMacro_FindAndUseVTK.cmake
@@ -2,6 +2,8 @@ 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)
@@ -12,6 +14,7 @@ MACRO(CREA_FIND_AND_USE_VTK)
       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
 
 	IF(VTK_USE_GL2PS)
            	add_definitions(-DUSE_WXGLCANVAS)
diff --git a/cmake/CREAMacro_FindAndUseWxWidgets.cmake b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
index 00b6425..1081816 100644
--- a/cmake/CREAMacro_FindAndUseWxWidgets.cmake
+++ b/cmake/CREAMacro_FindAndUseWxWidgets.cmake
@@ -74,7 +74,7 @@ MACRO(CREA_USE_WXWIDGETS)
     SET(WXWIDGETS_LIBRARIES
       ${WXWIDGETS_LIBRARIES}  
 #DO NOT FORCE DEBUG LIBS !!
-      debug wxmsw28d_aui
+      #DFCH debug wxmsw28d_aui
       optimized wxmsw28_aui
       debug msvcrtd
       debug msvcprtd