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

diff --combined tools/CMakeLists.txt
index bdd7d7447079b062ff8dd221bea4b8816f584425,45a06acd30c6367b0e0843f75df310179d9ae7b9..e79de4027db17c788f7207fe923c51a8e6768403
--- 1/tools/CMakeLists.txt
--- 2/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@@ -38,7 -38,7 +38,7 @@@ IF (CLITK_BUILD_TOOLS
    WRAP_GGO(clitkImageInfo_GGO_C clitkImageInfo.ggo)
    ADD_EXECUTABLE(clitkImageInfo clitkImageInfo.cxx ${clitkImageInfo_GGO_C})
    TARGET_LINK_LIBRARIES(clitkImageInfo clitkCommon ${ITK_LIBRARIES})
-   SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicom2Image)
+   SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageInfo)
  
    ADD_EXECUTABLE(clitkImageConvert clitkImageConvert.cxx)
    TARGET_LINK_LIBRARIES(clitkImageConvert clitkImageConvertLib clitkCommon ${ITK_LIBRARIES})
@@@ -157,15 -157,10 +157,15 @@@
    TARGET_LINK_LIBRARIES(clitkAutoCrop clitkCommon ${ITK_LIBRARIES} )
    SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkAutoCrop)
  
 -  WRAP_GGO(clitkDicomRTStruct2BinaryImage_GGO_C clitkDicomRTStruct2BinaryImage.ggo)
 -  ADD_EXECUTABLE(clitkDicomRTStruct2BinaryImage clitkDicomRTStruct2BinaryImage.cxx ${clitkDicomRTStruct2BinaryImage_GGO_C})
 -  TARGET_LINK_LIBRARIES(clitkDicomRTStruct2BinaryImage clitkDicomRTStruct clitkCommon ${ITK_LIBRARIES} )
 -  SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomRTStruct2BinaryImage)
 +  WRAP_GGO(clitkDicomRTStruct2Image_GGO_C clitkDicomRTStruct2Image.ggo)
 +  ADD_EXECUTABLE(clitkDicomRTStruct2Image clitkDicomRTStruct2Image.cxx ${clitkDicomRTStruct2Image_GGO_C})
 +  TARGET_LINK_LIBRARIES(clitkDicomRTStruct2Image clitkDicomRTStruct clitkCommon ${ITK_LIBRARIES} )
 +  SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomRTStruct2Image)
 +
 +  WRAP_GGO(clitkImage2DicomRTStruct_GGO_C clitkImage2DicomRTStruct.ggo)
 +  ADD_EXECUTABLE(clitkImage2DicomRTStruct clitkImage2DicomRTStruct.cxx ${clitkImage2DicomRTStruct_GGO_C})
 +  TARGET_LINK_LIBRARIES(clitkImage2DicomRTStruct clitkDicomRTStruct clitkCommon ${ITK_LIBRARIES} )
 +  SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImage2DicomRTStruct)
  
    WRAP_GGO(clitkImageLog_GGO_C clitkImageLog.ggo)
    ADD_EXECUTABLE(clitkImageLog clitkImageLog.cxx ${clitkImageLog_GGO_C})