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

diff --combined tools/CMakeLists.txt
index b73aaae9dbd1409d37e223aca632e49b8c2b292b,1f2b07a377579d4ff54986a46f3069515107f2fb..eb04d25a276cc3222deaa14c213ba7133f0e900e
--- 1/tools/CMakeLists.txt
--- 2/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@@ -126,7 -126,7 +126,7 @@@ IF (CLITK_BUILD_TOOLS
  
    WRAP_GGO(clitkGammaIndex_GGO_C clitkGammaIndex.ggo)
    ADD_EXECUTABLE(clitkGammaIndex clitkGammaIndex.cxx ${clitkGammaIndex_GGO_C})
 -  TARGET_LINK_LIBRARIES(clitkGammaIndex vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging)
 +  TARGET_LINK_LIBRARIES(clitkGammaIndex clitkCommon ${VTK_LIBRARIES} ${ITK_LIBRARIES} vtkIO)
    SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkGammaIndex)
  
    ADD_EXECUTABLE(clitkImageArithm clitkImageArithm.cxx)
@@@ -348,7 -348,11 +348,11 @@@
  
      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)