Merge branch 'master' of tux.creatis.insa-lyon.fr:clitk

[clitk.git] / cmake / dependencies.cmake

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index 0ab0b6605fad348061c1beb10afe3af1e76f54f7..065469736579253f50c44b57c55730da2d518617 100644 (file)
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -23,9 +23,14 @@ IF(VTK_FOUND)
       vtkWidgets
       vtkImaging
       vtkHybrid
-      vtkQVTK
       )
   ENDIF(VTK_VERSION VERSION_LESS 5.8.0)
+  IF(VTK_VERSION VERSION_LESS 5.6.0)
+    SET ( VTK_LIBRARIES
+      ${VTK_LIBRARIES}
+      vtkQVTK
+    )
+  ENDIF(VTK_VERSION VERSION_LESS 5.6.0)
 ELSE(VTK_FOUND)
   MESSAGE(FATAL_ERROR "Please set VTK_DIR.")
 ENDIF(VTK_FOUND)
@@ -44,9 +49,6 @@ IF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
 #  MESSAGE("Install libstatgrab (http://www.i-scream.org/libstatgrab/) for memory usage information")
   SET(CLITK_MEMORY_INFO OFF)
 ELSE (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
-  LINK_DIRECTORIES(${LIBSTATGRAB}/../lib)
-  LINK_DIRECTORIES(${LIBSTATGRAB}/../lib64)
-  INCLUDE_DIRECTORIES(${LIBSTATGRAB}/../include)
   SET(CLITK_MEMORY_INFO ON)
 ENDIF (${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")  
 #=========================================================