DFCH: Find vtk lib path

diff --git a/cmake/CREAMacro_FindAndUseVTK.cmake b/cmake/CREAMacro_FindAndUseVTK.cmake
index 751426ab3211cd7b888a4e99fd078dc9e93d6ae2..aee215f303e7083a1263a18f169b6aafbdc3c99a 100644 (file)
--- 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 00b642516e842d7c330c0babd96b49829f211a69..10818161baebd3ff96665527316f613f3f6c924e 100644 (file)
--- 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