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

diff --combined tools/CMakeLists.txt
index d785a49f9cd5c211f235c5c2b7cd4d8d361a61bc,925c1f86e0db1c4abd5609c6a72d42bff9ec64d9..8bf0cbc26cf5ebf2a0a443040fac459a03bc1f1e
--- 1/tools/CMakeLists.txt
--- 2/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@@ -35,6 -35,11 +35,11 @@@ IF (CLITK_BUILD_TOOLS
    TARGET_LINK_LIBRARIES(clitkDicom2Image clitkCommon ${ITK_LIBRARIES})
    SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicom2Image)
  
+   WRAP_GGO(clitkDicomWave2Text_GGO_C clitkDicomWave2Text.ggo)
+   ADD_EXECUTABLE(clitkDicomWave2Text clitkDicomWave2Text.cxx ${clitkDicomWave2Text_GGO_C})
+   TARGET_LINK_LIBRARIES(clitkDicomWave2Text clitkCommon ${ITK_LIBRARIES})
+   SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomWave2Text)
+ 
    WRAP_GGO(clitkImageInfo_GGO_C clitkImageInfo.ggo)
    ADD_EXECUTABLE(clitkImageInfo clitkImageInfo.cxx ${clitkImageInfo_GGO_C})
    TARGET_LINK_LIBRARIES(clitkImageInfo clitkCommon ${ITK_LIBRARIES})
@@@ -157,15 -162,10 +162,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})