From: David Sarrut <david.sarrut@gmail.com>
Date: Mon, 24 Oct 2011 05:25:11 +0000 (+0200)
Subject: Merge branch 'master' of /home/dsarrut/clitk3.server
X-Git-Tag: v1.3.0~174^2~41
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=9019bb8f0b75ff31cbb78f063cbc8eb4d8679834;hp=6f9f7ec60d11ef7a4c189aa190e36027fa758dde;p=clitk.git

Merge branch 'master' of /home/dsarrut/clitk3.server
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e552d97..fd3ea26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,8 +124,6 @@ SET(SCRIPTS
   scripts/create_midP_masks-2.0.sh  
   scripts/pts_to_landmarks.sh
   scripts/create_mhd_3D.sh
-  scripts/create_sequence.sh
-  scripts/dcm_sort_by_field.sh
   scripts/dicom_info.sh
 )
 
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 34a6918..be453b1 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -358,7 +358,11 @@ IF (CLITK_BUILD_TOOLS)
 
     WRAP_GGO(clitkMeshToBinaryImage_GGO_C clitkMeshToBinaryImage.ggo)
     ADD_EXECUTABLE(clitkMeshToBinaryImage clitkMeshToBinaryImage.cxx ${clitkMeshToBinaryImage_GGO_C})
-    TARGET_LINK_LIBRARIES(clitkMeshToBinaryImage clitkCommon ${ITK_LIBRARIES} ${VTK_LIBRARIES})
+    IF(VTK_VERSION VERSION_LESS 5.8.0)
+      TARGET_LINK_LIBRARIES(clitkMeshToBinaryImage clitkCommon ${ITK_LIBRARIES} vtkHybrid vtkIO)
+    ELSE(VTK_VERSION VERSION_LESS 5.8.0)
+      TARGET_LINK_LIBRARIES(clitkMeshToBinaryImage clitkCommon ${ITK_LIBRARIES} ${VTK_LIBRARIES})
+    ENDIF(VTK_VERSION VERSION_LESS 5.8.0)
     SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMeshToBinaryImage)
 
     WRAP_GGO(clitkMeshViewer_GGO_C clitkMeshViewer.ggo)