X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FCMakeLists.txt;h=cc77ea3a332a9cd2eff93ab88e89b82ffc8a86ce;hb=cb5f6e9c4ca38eb5a304eb2b278ce049d2ca838b;hp=b9d2441fb52b47f75dc8f64a80f391fdd6546287;hpb=18fd13ca69bbe5a6d91e070fef22ca9c64c92063;p=clitk.git

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index b9d2441..cc77ea3 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,24 +1,25 @@
 #=========================================================
 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 clitkCropImage clitkResampleImage clitkMIP)
-    WRAP_GGO(${clitkTool}_GGO_C ${clitkTool}.ggo)
-    SET(GGO_C_FILES ${GGO_C_FILES} ${${clitkTool}_GGO_C})
-ENDFOREACH(clitkTool)
-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(clitkBinarizeImageLib clitkBinarizeImageGenericFilter.cxx)
-ADD_LIBRARY(clitkImageArithmImageLib clitkImageArithmGenericFilter.cxx)
-ADD_LIBRARY(clitkResampleImageLib clitkResampleImageGenericFilter.cxx)
-ADD_LIBRARY(clitkMIPLib clitkMIPGenericFilter.cxx)
+# Add Libraries used in vv and clitk to avoid recompilation
+WRAP_GGO(clitkCropImage_GGO_C clitkCropImage.ggo)
+ADD_LIBRARY(clitkCropImageLib clitkCropImageGenericFilter.cxx ${clitkCropImage_GGO_C})
+
+WRAP_GGO(clitkImageConvert_GGO_C clitkImageConvert.ggo)
+ADD_LIBRARY(clitkImageConvertLib clitkImageConvertGenericFilter.cxx ${clitkImageConvert_GGO_C})
+
+WRAP_GGO(clitkBinarizeImage_GGO_C clitkBinarizeImage.ggo)
+ADD_LIBRARY(clitkBinarizeImageLib clitkBinarizeImageGenericFilter.cxx ${clitkBinarizeImage_GGO_C})
 
-TARGET_LINK_LIBRARIES(clitkBinarizeImageLib clitkToolsGgoLib)
+WRAP_GGO(clitkImageArithm_GGO_C clitkImageArithm.ggo)
+ADD_LIBRARY(clitkImageArithmImageLib clitkImageArithmGenericFilter.cxx ${clitkImageArithm_GGO_C})
+
+WRAP_GGO(clitkResampleImage_GGO_C clitkResampleImage.ggo)
+ADD_LIBRARY(clitkResampleImageLib clitkResampleImageGenericFilter.cxx ${clitkResampleImage_GGO_C})
+
+WRAP_GGO(clitkMIP_GGO_C clitkMIP.ggo)
+ADD_LIBRARY(clitkMIPLib clitkMIPGenericFilter.cxx ${clitkMIP_GGO_C})
 
 IF (CLITK_BUILD_TOOLS)
     WRAP_GGO(clitkDicomInfo_GGO_C clitkDicomInfo.ggo)
@@ -33,11 +34,10 @@ IF (CLITK_BUILD_TOOLS)
     ADD_EXECUTABLE(clitkImageInfo clitkImageInfo.cxx ${clitkImageInfo_GGO_C})
     TARGET_LINK_LIBRARIES(clitkImageInfo clitkCommon ITKIO)
 
-    ADD_EXECUTABLE(clitkImageConvert clitkImageConvert.cxx ${clitkImageConvert_GGO_C})
+    ADD_EXECUTABLE(clitkImageConvert clitkImageConvert.cxx)
     TARGET_LINK_LIBRARIES(clitkImageConvert clitkImageConvertLib clitkCommon ITKIO)
 
-    ADD_EXECUTABLE(clitkBinarizeImage clitkBinarizeImage.cxx
-       ${clitkBinarizeImage_GGO_C})
+    ADD_EXECUTABLE(clitkBinarizeImage clitkBinarizeImage.cxx)
     TARGET_LINK_LIBRARIES(clitkBinarizeImage clitkBinarizeImageLib clitkCommon ITKIO)
 
     WRAP_GGO(clitkVFResample_GGO_C clitkVFResample.ggo)
@@ -85,6 +85,7 @@ IF (CLITK_BUILD_TOOLS)
     ADD_EXECUTABLE(clitkInvertVF clitkInvertVF.cxx ${clitkInvertVF_GGO_C})
     TARGET_LINK_LIBRARIES(clitkInvertVF clitkCommon ITKIO )
 
+    WRAP_GGO(clitkAffineTransform_GGO_C clitkAffineTransform.ggo)
     ADD_EXECUTABLE(clitkAffineTransform clitkAffineTransform.cxx ${clitkAffineTransform_GGO_C})
     TARGET_LINK_LIBRARIES(clitkAffineTransform clitkCommon ITKIO )
 
@@ -98,9 +99,9 @@ IF (CLITK_BUILD_TOOLS)
 
     WRAP_GGO(clitkGammaIndex_GGO_C clitkGammaIndex.ggo)
     ADD_EXECUTABLE(clitkGammaIndex clitkGammaIndex.cxx ${clitkGammaIndex_GGO_C})
-    TARGET_LINK_LIBRARIES(clitkGammaIndex ITKBasicFilters ITKCommon ITKIO)
+    TARGET_LINK_LIBRARIES(clitkGammaIndex vtkCommon vtkFiltering vtkGraphics vtkIO vtkImaging)
 
-    ADD_EXECUTABLE(clitkImageArithm clitkImageArithm.cxx ${clitkImageArithm_GGO_C})
+    ADD_EXECUTABLE(clitkImageArithm clitkImageArithm.cxx)
     TARGET_LINK_LIBRARIES(clitkImageArithm clitkImageArithmImageLib clitkCommon ITKIO )
 
     WRAP_GGO(clitkUnsharpMask_GGO_C clitkUnsharpMask.ggo)
@@ -111,11 +112,11 @@ IF (CLITK_BUILD_TOOLS)
     ADD_EXECUTABLE(clitkFooImage clitkFooImage.cxx ${clitkFooImage_GGO_C})
     TARGET_LINK_LIBRARIES(clitkFooImage clitkCommon ITKIO ) 
 
+    WRAP_GGO(clitkMedianImageFilter_GGO_C clitkMedianImageFilter.ggo)
     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 ${clitkResampleImage_GGO_C})
+    ADD_EXECUTABLE(clitkResampleImage clitkResampleImage.cxx)
     TARGET_LINK_LIBRARIES(clitkResampleImage clitkResampleImageLib clitkCommon ITKIO)
 
     WRAP_GGO(clitkMinMaxMask_GGO_C clitkMinMaxMask.ggo)
@@ -127,7 +128,7 @@ IF (CLITK_BUILD_TOOLS)
     # TARGET_LINK_LIBRARIES(clitkAutoCrop clitkCommon ITKIO )
 
     WRAP_GGO(clitkDicomRTStruct2BinaryImage_GGO_C clitkDicomRTStruct2BinaryImage.ggo)
-    ADD_EXECUTABLE(clitkDicomRTStruct2BinaryImage clitkDicomRT_ROI_ConvertToImageFilter.cxx clitkDicomRTStruct2BinaryImage.cxx ${clitkDicomRTStruct2BinaryImage_GGO_C})
+    ADD_EXECUTABLE(clitkDicomRTStruct2BinaryImage clitkDicomRTStruct2BinaryImage.cxx ${clitkDicomRTStruct2BinaryImage_GGO_C})
     TARGET_LINK_LIBRARIES(clitkDicomRTStruct2BinaryImage ITKCommon clitkDicomRTStruct clitkCommon ITKIO )
 
     WRAP_GGO(clitkImageLog_GGO_C clitkImageLog.ggo)
@@ -155,7 +156,7 @@ IF (CLITK_BUILD_TOOLS)
     TARGET_LINK_LIBRARIES(clitkBackProjectImage ITKIO clitkCommon )
 
     ADD_EXECUTABLE(clitkCropImage clitkCropImage.cxx ${clitkCropImage_GGO_C})
-    TARGET_LINK_LIBRARIES(clitkCropImage clitkCommon ITKIO)
+    TARGET_LINK_LIBRARIES(clitkCropImage clitkCropImageLib clitkCommon ITKIO)
 
     # WRAP_GGO(clitkExtractSlice_GGO_C clitkExtractSlice.ggo)
     # ADD_EXECUTABLE(clitkExtractSlice clitkExtractSlice.cxx clitkExtractSliceGenericFilter.cxx ${clitkExtractSlice_GGO_C})
@@ -237,11 +238,15 @@ IF (CLITK_BUILD_TOOLS)
     ADD_EXECUTABLE(clitkValuesToBSplineCoefficients  clitkValuesToBSplineCoefficients.cxx clitkValuesToBSplineCoefficientsGenericFilter.cxx ${clitkValuesToBSplineCoefficients_GGO_C})
     TARGET_LINK_LIBRARIES(clitkValuesToBSplineCoefficients clitkCommon ITKIO)
 
-    ADD_EXECUTABLE(clitkMIP  clitkMIP.cxx clitkMIPGenericFilter.cxx ${clitkMIP_GGO_C})
-    TARGET_LINK_LIBRARIES(clitkMIP clitkCommon ITKIO)
+    ADD_EXECUTABLE(clitkMIP clitkMIP.cxx clitkMIPGenericFilter.cxx)
+    TARGET_LINK_LIBRARIES(clitkMIP clitkMIPLib clitkCommon ITKIO)
 
     WRAP_GGO(clitkRelativePosition_GGO_C clitkRelativePosition.ggo)
     ADD_EXECUTABLE(clitkRelativePosition  clitkRelativePosition.cxx ${clitkRelativePosition_GGO_C})
     TARGET_LINK_LIBRARIES(clitkRelativePosition clitkCommon ITKIO)
 
+    WRAP_GGO(clitkTransformLandmarks_GGO_C clitkTransformLandmarks.ggo)
+    ADD_EXECUTABLE(clitkTransformLandmarks clitkTransformLandmarks.cxx ${clitkTransformLandmarks_GGO_C})
+    TARGET_LINK_LIBRARIES(clitkTransformLandmarks clitkCommon ITKIO)
+
 ENDIF(CLITK_BUILD_TOOLS)