X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FCMakeLists.txt;h=ac7478022a51cd5fdb0a9d73200c8fecf3a69b2f;hb=e8ad7864b6b9875fc7917416d8c5b37cc7b3b27d;hp=02a0511ab60a4bbdc045ff2eafdba0f2e9e7167d;hpb=867fad1c5395a1931440882c84f7cab67a81d7fe;p=clitk.git

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 02a0511..ac74780 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -3,8 +3,7 @@ INCLUDE(${PROJECT_SOURCE_DIR}/cmake/common.cmake)
 #=========================================================
 #Add your ggo files to this list if they are used by vv
 FOREACH(clitkTool clitkAffineTransform clitkBinarizeImage clitkImageArithm
-        clitkMedianImageFilter clitkImageConvert clitkImageResample clitkCropImage
-        clitkMIP)
+        clitkMedianImageFilter clitkImageConvert clitkCropImage clitkResampleImage clitkMIP)
     WRAP_GGO(${clitkTool}_GGO_C ${clitkTool}.ggo)
     SET(GGO_C_FILES ${GGO_C_FILES} ${${clitkTool}_GGO_C})
 ENDFOREACH(clitkTool)
@@ -14,9 +13,9 @@ ADD_LIBRARY(clitkToolsGgoLib ${GGO_C_FILES})
 #the libraries avoid recompilation for vv, and should be used for generic filters
 #with long compilation times that are used by vv
 ADD_LIBRARY(clitkImageConvertLib clitkImageConvertGenericFilter.cxx)
-ADD_LIBRARY(clitkImageResampleLib clitkImageResampleGenericFilter.cxx)
 ADD_LIBRARY(clitkBinarizeImageLib clitkBinarizeImageGenericFilter.cxx)
 ADD_LIBRARY(clitkImageArithmImageLib clitkImageArithmGenericFilter.cxx)
+ADD_LIBRARY(clitkResampleImageLib clitkResampleImageGenericFilter.cxx)
 ADD_LIBRARY(clitkMIPLib clitkMIPGenericFilter.cxx)
 
 TARGET_LINK_LIBRARIES(clitkBinarizeImageLib clitkToolsGgoLib)
@@ -24,7 +23,11 @@ TARGET_LINK_LIBRARIES(clitkBinarizeImageLib clitkToolsGgoLib)
 IF (CLITK_BUILD_TOOLS)
     WRAP_GGO(clitkDicomInfo_GGO_C clitkDicomInfo.ggo)
     ADD_EXECUTABLE(clitkDicomInfo clitkDicomInfo.cxx ${clitkDicomInfo_GGO_C})
-    TARGET_LINK_LIBRARIES(clitkDicomInfo clitkCommon ITKIO) 
+    TARGET_LINK_LIBRARIES(clitkDicomInfo clitkCommon ITKIO)
+
+    WRAP_GGO(clitkDicom2Image_GGO_C clitkDicom2Image.ggo)
+    ADD_EXECUTABLE(clitkDicom2Image clitkDicom2Image.cxx ${clitkDicom2Image_GGO_C})
+    TARGET_LINK_LIBRARIES(clitkDicom2Image clitkCommon ITKIO)
 
     WRAP_GGO(clitkImageInfo_GGO_C clitkImageInfo.ggo)
     ADD_EXECUTABLE(clitkImageInfo clitkImageInfo.cxx ${clitkImageInfo_GGO_C})
@@ -37,11 +40,7 @@ IF (CLITK_BUILD_TOOLS)
        ${clitkBinarizeImage_GGO_C})
     TARGET_LINK_LIBRARIES(clitkBinarizeImage clitkBinarizeImageLib clitkCommon ITKIO)
 
-    # ADD_EXECUTABLE(clitkImageResample clitkImageResample.cxx
-    # ${clitkImageResample_GGO_C})
-    # TARGET_LINK_LIBRARIES(clitkImageResample clitkImageResampleLib clitkCommon ITKIO )
-
-    WRAP_GGO(clitkVFResample_GGO_C clitkImageResample.ggo)
+    WRAP_GGO(clitkVFResample_GGO_C clitkVFResample.ggo)
     ADD_EXECUTABLE(clitkVFResample clitkVFResample.cxx clitkVFResampleGenericFilter.cxx ${clitkVFResample_GGO_C})
     TARGET_LINK_LIBRARIES(clitkVFResample clitkCommon ITKIO)
 
@@ -111,9 +110,9 @@ IF (CLITK_BUILD_TOOLS)
     ADD_EXECUTABLE(clitkMedianImageFilter clitkMedianImageFilter.cxx ${clitkMedianImageFilter_GGO_C})
     TARGET_LINK_LIBRARIES(clitkMedianImageFilter clitkCommon ITKIO ITKBasicFilters )
 
-    WRAP_GGO(clitkResampleImage_GGO_C clitkResampleImage.ggo)
-    ADD_EXECUTABLE(clitkResampleImage clitkResampleImage.cxx clitkResampleImageGenericFilter.cxx ${clitkResampleImage_GGO_C})
-    TARGET_LINK_LIBRARIES(clitkResampleImage clitkCommon ITKIO)
+    #WRAP_GGO(clitkResampleImage_GGO_C clitkResampleImage.ggo)
+    ADD_EXECUTABLE(clitkResampleImage clitkResampleImage.cxx ${clitkResampleImage_GGO_C})
+    TARGET_LINK_LIBRARIES(clitkResampleImage clitkResampleImageLib clitkCommon ITKIO)
 
     WRAP_GGO(clitkMinMaxMask_GGO_C clitkMinMaxMask.ggo)
     ADD_EXECUTABLE(clitkMinMaxMask clitkMinMaxMask.cxx ${clitkMinMaxMask_GGO_C})
@@ -151,14 +150,13 @@ IF (CLITK_BUILD_TOOLS)
     ADD_EXECUTABLE(clitkBackProjectImage clitkBackProjectImage.cxx clitkBackProjectImageGenericFilter.cxx ${clitkBackProjectImage_GGO_C})
     TARGET_LINK_LIBRARIES(clitkBackProjectImage ITKIO clitkCommon )
 
-#    WRAP_GGO(clitkCropImage_GGO_C clitkCropImage.ggo)
     ADD_EXECUTABLE(clitkCropImage clitkCropImage.cxx ${clitkCropImage_GGO_C})
     TARGET_LINK_LIBRARIES(clitkCropImage clitkCommon ITKIO)
 
-# WRAP_GGO(clitkExtractSlice_GGO_C clitkExtractSlice.ggo)
-# ADD_EXECUTABLE(clitkExtractSlice clitkExtractSlice.cxx clitkExtractSliceGenericFilter.cxx ${clitkExtractSlice_GGO_C})
-# TARGET_LINK_LIBRARIES(clitkExtractSlice clitkCommon ITKIO)
-
+    # WRAP_GGO(clitkExtractSlice_GGO_C clitkExtractSlice.ggo)
+    # ADD_EXECUTABLE(clitkExtractSlice clitkExtractSlice.cxx clitkExtractSliceGenericFilter.cxx ${clitkExtractSlice_GGO_C})
+    # TARGET_LINK_LIBRARIES(clitkExtractSlice clitkCommon ITKIO)
+    
     WRAP_GGO(clitkFlipImage_GGO_C clitkFlipImage.ggo)
     ADD_EXECUTABLE(clitkFlipImage clitkFlipImage.cxx clitkFlipImageGenericFilter.cxx ${clitkFlipImage_GGO_C})
     TARGET_LINK_LIBRARIES(clitkFlipImage clitkCommon ITKIO)
@@ -235,7 +233,11 @@ IF (CLITK_BUILD_TOOLS)
     ADD_EXECUTABLE(clitkValuesToBSplineCoefficients  clitkValuesToBSplineCoefficients.cxx clitkValuesToBSplineCoefficientsGenericFilter.cxx ${clitkValuesToBSplineCoefficients_GGO_C})
     TARGET_LINK_LIBRARIES(clitkValuesToBSplineCoefficients clitkCommon ITKIO)
 
-    WRAP_GGO(clitkMIP_GGO_C clitkMIP.ggo)
     ADD_EXECUTABLE(clitkMIP  clitkMIP.cxx clitkMIPGenericFilter.cxx ${clitkMIP_GGO_C})
     TARGET_LINK_LIBRARIES(clitkMIP clitkCommon ITKIO)
+
+    WRAP_GGO(clitkRelativePosition_GGO_C clitkRelativePosition.ggo)
+    ADD_EXECUTABLE(clitkRelativePosition  clitkRelativePosition.cxx ${clitkRelativePosition_GGO_C})
+    TARGET_LINK_LIBRARIES(clitkRelativePosition clitkCommon ITKIO)
+
 ENDIF(CLITK_BUILD_TOOLS)