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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e552d978311bade44b56c8c6f96d04d012fb6e41..fd3ea26bc9571c0e971224ea779a229663d5ad5a 100644 (file)
--- 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 34a6918f08b539f6496290c4db880fef69e40835..be453b1cb99d2d3fa52ca71baef8de92bd7aeef3 100644 (file)
--- 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)