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

diff --combined tools/CMakeLists.txt
index 4ce6ac79a09b122a0649786ad601f51222870f2f,5222f12b9650d8d0ba9e42fca6b5f3530d942d34..4bd6e1511c38e961a5b53ee8501d77aac805bcd8
--- 1/tools/CMakeLists.txt
--- 2/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@@ -315,11 -315,6 +315,11 @@@ IF (CLITK_BUILD_TOOLS
    TARGET_LINK_LIBRARIES(clitkRelativePosition clitkCommon ${ITK_LIBRARIES})
    SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkRelativePosition)
  
 +  WRAP_GGO(clitkRelativePositionAnalyzer_GGO_C clitkRelativePositionAnalyzer.ggo)
 +  ADD_EXECUTABLE(clitkRelativePositionAnalyzer  clitkRelativePositionAnalyzer.cxx ${clitkRelativePositionAnalyzer_GGO_C})
 +  TARGET_LINK_LIBRARIES(clitkRelativePositionAnalyzer clitkCommon ${ITK_LIBRARIES})
 +  SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkRelativePositionAnalyzer)
 +
    WRAP_GGO(clitkTransformLandmarks_GGO_C clitkTransformLandmarks.ggo)
    ADD_EXECUTABLE(clitkTransformLandmarks clitkTransformLandmarks.cxx ${clitkTransformLandmarks_GGO_C})
    TARGET_LINK_LIBRARIES(clitkTransformLandmarks clitkCommon ${ITK_LIBRARIES})
@@@ -351,6 -346,11 +351,11 @@@
      TARGET_LINK_LIBRARIES(clitkBinaryImageToMesh ${ITK_LIBRARIES} vtkCommon vtkRendering)
      SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkBinaryImageToMesh)
  
+     WRAP_GGO(clitkMeshToBinaryImage_GGO_C clitkMeshToBinaryImage.ggo)
+     ADD_EXECUTABLE(clitkMeshToBinaryImage clitkMeshToBinaryImage.cxx ${clitkMeshToBinaryImage_GGO_C})
+     TARGET_LINK_LIBRARIES(clitkMeshToBinaryImage clitkCommon ${ITK_LIBRARIES} ${VTK_LIBRARIES})
+     SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMeshToBinaryImage)
+ 
      WRAP_GGO(clitkMeshViewer_GGO_C clitkMeshViewer.ggo)
      ADD_EXECUTABLE(clitkMeshViewer clitkMeshViewer.cxx ${clitkMeshViewer_GGO_C})
      TARGET_LINK_LIBRARIES(clitkMeshViewer vtkCommon vtkRendering)