Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

diff --combined tools/CMakeLists.txt
index aea5c93d4619f3727dfbff6cb57885baf661e5ec,e6126f35b225a8594bb219ca814957cddeb7d223..f06ae75715beb2a34dfa4d25d573dc43bc90db73
--- 1/tools/CMakeLists.txt
--- 2/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@@ -93,7 -93,7 +93,7 @@@ IF (CLITK_BUILD_TOOLS
    WRAP_GGO(clitkAffineTransform_GGO_C clitkAffineTransform.ggo)
    ADD_EXECUTABLE(clitkAffineTransform clitkAffineTransform.cxx ${clitkAffineTransform_GGO_C})
    TARGET_LINK_LIBRARIES(clitkAffineTransform clitkCommon ${ITK_LIBRARIES} )
-   SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicom2Image)
+   SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkAffineTransform)
  
    WRAP_GGO(clitkSetBackground_GGO_C clitkSetBackground.ggo)
    ADD_EXECUTABLE(clitkSetBackground clitkSetBackground.cxx clitkSetBackgroundGenericFilter.cxx ${clitkSetBackground_GGO_C})
@@@ -180,7 -180,7 +180,7 @@@
    WRAP_GGO(clitkImageMoment_GGO_C clitkImageMoment.ggo)
    ADD_EXECUTABLE(clitkImageMoment clitkImageMoment.cxx clitkImageMomentGenericFilter.cxx ${clitkImageMoment_GGO_C})
    TARGET_LINK_LIBRARIES(clitkImageMoment clitkCommon ${ITK_LIBRARIES})
-   SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicom2Image)
+   SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageMoment)
  
    WRAP_GGO(clitkImageStatistics_GGO_C clitkImageStatistics.ggo)
    ADD_EXECUTABLE(clitkImageStatistics clitkImageStatistics.cxx clitkImageStatisticsGenericFilter.cxx ${clitkImageStatistics_GGO_C})
@@@ -230,11 -230,6 +230,6 @@@
    TARGET_LINK_LIBRARIES(clitkCatImage clitkCommon ${ITK_LIBRARIES})
    SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkCatImage)
  
-   WRAP_GGO(clitkCoeffsToDVF_GGO_C clitkCoeffsToDVF.ggo)
-   ADD_EXECUTABLE(clitkCoeffsToDVF clitkCoeffsToDVF.cxx ${clitkCoeffsToDVF_GGO_C})
-   TARGET_LINK_LIBRARIES(clitkCoeffsToDVF clitkCommon ${ITK_LIBRARIES})
-   SET(TOOLS_INSTALL ${TOOLS_INSTALL} clitkCoeffsToDVF)
- 
    IF(CLITK_EXPERIMENTAL)
      WRAP_GGO(clitkBinaryImageToMesh_GGO_C clitkBinaryImageToMesh.ggo)
      ADD_EXECUTABLE(clitkBinaryImageToMesh clitkBinaryImageToMesh.cxx ${clitkBinaryImageToMesh_GGO_C})
@@@ -253,7 -248,7 +248,7 @@@
    ENDIF(CLITK_EXPERIMENTAL)
  
    IF(ITK_VERSION_MAJOR VERSION_LESS 4)
 -    MESSAGE(WARNING "clitkDicomRTPlan2Gate is not compatible with GDCM<2 (ITK<4). It will not be build.")
 +    MESSAGE("clitkDicomRTPlan2Gate is not compatible with GDCM<2 (ITK<4). It will not be built.")
    ELSE(ITK_VERSION_MAJOR VERSION_LESS 4)
      WRAP_GGO(clitkDicomRTPlan2Gate_GGO_C clitkDicomRTPlan2Gate.ggo)
      ADD_EXECUTABLE(clitkDicomRTPlan2Gate clitkDicomRTPlan2Gate.cxx clitkDicomRTPlan2Gate_ggo.c)