X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=tools%2FCMakeLists.txt;h=606027ee16e458b00f5d2f326b619f8bee0d3e84;hb=fce6ea8b8d138b30dc2a535cffc725c8cb26130d;hp=fbab5f54cfd300f8eb61f1780f30565328020af9;hpb=ff4e821006c760607319ef7cc58dd9f4f17a7098;p=clitk.git

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index fbab5f5..606027e 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -12,15 +12,15 @@ add_library(clitkBinarizeImageLib clitkBinarizeImageGenericFilter.cxx ${clitkBin
 WRAP_GGO(clitkProfileImage_GGO_C clitkProfileImage.ggo)
 add_library(clitkProfileImageLib clitkProfileImageGenericFilter.cxx ${clitkProfileImage_GGO_C})
 
+WRAP_GGO(clitkHistogramImage_GGO_C clitkHistogramImage.ggo)
+add_library(clitkHistogramImageLib clitkHistogramImageGenericFilter.cxx ${clitkHistogramImage_GGO_C})
+
 WRAP_GGO(clitkImageArithm_GGO_C clitkImageArithm.ggo)
 add_library(clitkImageArithmImageLib clitkImageArithmGenericFilter.cxx ${clitkImageArithm_GGO_C})
 
 WRAP_GGO(clitkVectorArithm_GGO_C clitkVectorArithm.ggo)
 add_library(clitkVectorArithmLib clitkVectorArithmGenericFilter.cxx ${clitkVectorArithm_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})
 
@@ -61,11 +61,15 @@ if(CLITK_BUILD_TOOLS)
   add_executable(clitkBinarizeImage clitkBinarizeImage.cxx)
   target_link_libraries(clitkBinarizeImage clitkBinarizeImageLib clitkCommon)
   set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkBinarizeImage)
-  
+
   add_executable(clitkProfileImage clitkProfileImage.cxx)
   target_link_libraries(clitkProfileImage clitkProfileImageLib clitkCommon)
   set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkProfileImage)
 
+  add_executable(clitkHistogramImage clitkHistogramImage.cxx)
+  target_link_libraries(clitkHistogramImage clitkHistogramImageLib clitkCommon)
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkHistogramImage)
+
   WRAP_GGO(clitkVFResample_GGO_C clitkVFResample.ggo)
   add_executable(clitkVFResample clitkVFResample.cxx clitkVFResampleGenericFilter.cxx ${clitkVFResample_GGO_C})
   target_link_libraries(clitkVFResample clitkCommon)
@@ -96,6 +100,26 @@ if(CLITK_BUILD_TOOLS)
   target_link_libraries(clitkWriteDicomSeries clitkCommon )
   set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkWriteDicomSeries)
 
+  WRAP_GGO(clitkGateSimulation2Dicom_GGO_C clitkGateSimulation2Dicom.ggo)
+  add_executable(clitkGateSimulation2Dicom clitkGateSimulation2Dicom.cxx ${clitkGateSimulation2Dicom_GGO_C})
+  target_link_libraries(clitkGateSimulation2Dicom clitkCommon )
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkGateSimulation2Dicom)
+
+  WRAP_GGO(clitkPartitionEnergyWindowDicom_GGO_C clitkPartitionEnergyWindowDicom.ggo)
+  add_executable(clitkPartitionEnergyWindowDicom clitkPartitionEnergyWindowDicom.cxx ${clitkPartitionEnergyWindowDicom_GGO_C})
+  target_link_libraries(clitkPartitionEnergyWindowDicom clitkCommon )
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkPartitionEnergyWindowDicom)
+
+  WRAP_GGO(clitkUpdateVRTagDicom_GGO_C clitkUpdateVRTagDicom.ggo)
+  add_executable(clitkUpdateVRTagDicom clitkUpdateVRTagDicom.cxx ${clitkUpdateVRTagDicom_GGO_C})
+  target_link_libraries(clitkUpdateVRTagDicom clitkCommon )
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkUpdateVRTagDicom)
+
+  WRAP_GGO(clitkImage2DicomDose_GGO_C clitkImage2DicomDose.ggo)
+  add_executable(clitkImage2DicomDose clitkImage2DicomDose.cxx ${clitkImage2DicomDose_GGO_C})
+  target_link_libraries(clitkImage2DicomDose clitkCommon)
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImage2DicomDose)
+
   WRAP_GGO(clitkMedianTemporalDimension_GGO_C clitkMedianTemporalDimension.ggo)
   add_executable(clitkMedianTemporalDimension clitkMedianTemporalDimension.cxx
     ${clitkMedianTemporalDimension_GGO_C})
@@ -165,10 +189,6 @@ if(CLITK_BUILD_TOOLS)
   target_link_libraries(clitkMedianImageFilter clitkMedianImageFilterLib clitkCommon)
   set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMedianImageFilter)
 
-  add_executable(clitkResampleImage clitkResampleImage.cxx)
-  target_link_libraries(clitkResampleImage clitkResampleImageLib clitkCommon)
-  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkResampleImage)
-
   WRAP_GGO(clitkMinMaxMask_GGO_C clitkMinMaxMask.ggo)
   add_executable(clitkMinMaxMask clitkMinMaxMask.cxx ${clitkMinMaxMask_GGO_C})
   target_link_libraries(clitkMinMaxMask clitkCommon  )
@@ -248,6 +268,16 @@ if(CLITK_BUILD_TOOLS)
   add_executable(clitkVectorImageToImage  clitkVectorImageToImage.cxx clitkVectorImageToImageGenericFilter.cxx ${clitkVectorImageToImage_GGO_C})
   target_link_libraries(clitkVectorImageToImage  clitkCommon)
   set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkVectorImageToImage)
+  
+  WRAP_GGO(clitkNVectorImageTo4DImage_GGO_C clitkNVectorImageTo4DImage.ggo)
+  add_executable(clitkNVectorImageTo4DImage  clitkNVectorImageTo4DImage.cxx clitkNVectorImageTo4DImageGenericFilter.cxx ${clitkNVectorImageTo4DImage_GGO_C})
+  target_link_libraries(clitkNVectorImageTo4DImage  clitkCommon)
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkNVectorImageTo4DImage)
+
+  WRAP_GGO(clitk4DImageToNVectorImage_GGO_C clitk4DImageToNVectorImage.ggo)
+  add_executable(clitk4DImageToNVectorImage  clitk4DImageToNVectorImage.cxx clitk4DImageToNVectorImageGenericFilter.cxx ${clitk4DImageToNVectorImage_GGO_C})
+  target_link_libraries(clitk4DImageToNVectorImage  clitkCommon)
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitk4DImageToNVectorImage)
 
   add_executable(clitkMIP clitkMIP.cxx clitkMIPGenericFilter.cxx)
   target_link_libraries(clitkMIP clitkMIPLib clitkCommon)
@@ -327,6 +357,12 @@ if(CLITK_BUILD_TOOLS)
   target_link_libraries(clitkImageIntensityWindowing clitkCommon )
   set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkImageIntensityWindowing)
 
+  WRAP_GGO(clitkMaskOfIntegratedIntensity_GGO_C clitkMaskOfIntegratedIntensity.ggo)
+  add_executable(clitkMaskOfIntegratedIntensity clitkMaskOfIntegratedIntensity.cxx ${clitkMaskOfIntegratedIntensity_GGO_C})
+  target_link_libraries(clitkMaskOfIntegratedIntensity clitkCommon )
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkMaskOfIntegratedIntensity)
+
+
   WRAP_GGO(clitkBlurImage_GGO_C clitkBlurImage.ggo)
   add_executable(clitkBlurImage clitkBlurImage.cxx ${clitkBlurImage_GGO_C})
   target_link_libraries(clitkBlurImage clitkCommon )
@@ -373,20 +409,15 @@ if(CLITK_BUILD_TOOLS)
 
 
   #=========================================================
-  if(ITK_VERSION_MAJOR VERSION_LESS 4)
-    message("clitkDice is not compatible with ITK<4. It will not be built.")
-    message("clitkDicomRTPlan2Gate is not compatible with GDCM<2 (ITK<4). It will not be built.")
-  else(ITK_VERSION_MAJOR VERSION_LESS 4)
-    WRAP_GGO(clitkDice_GGO_C clitkDice.ggo)
-    add_executable(clitkDice clitkDice.cxx ${clitkDice_GGO_C})
-    target_link_libraries(clitkDice clitkSegmentationGgoLib clitkCommon ${ITK_LIBRARIES} )
-    set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDice)
-
-    WRAP_GGO(clitkDicomRTPlan2Gate_GGO_C clitkDicomRTPlan2Gate.ggo)
-    add_executable(clitkDicomRTPlan2Gate clitkDicomRTPlan2Gate.cxx clitkDicomRTPlan2Gate_ggo.c)
-    target_link_libraries(clitkDicomRTPlan2Gate clitkCommon)
-    set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomRTPlan2Gate)
-  endif(ITK_VERSION_MAJOR VERSION_LESS 4)
+  WRAP_GGO(clitkDice_GGO_C clitkDice.ggo)
+  add_executable(clitkDice clitkDice.cxx ${clitkDice_GGO_C})
+  target_link_libraries(clitkDice clitkSegmentationGgoLib clitkCommon ${ITK_LIBRARIES} )
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDice)
+
+  WRAP_GGO(clitkDicomRTPlan2Gate_GGO_C clitkDicomRTPlan2Gate.ggo)
+  add_executable(clitkDicomRTPlan2Gate clitkDicomRTPlan2Gate.cxx clitkDicomRTPlan2Gate_ggo.c)
+  target_link_libraries(clitkDicomRTPlan2Gate clitkCommon)
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkDicomRTPlan2Gate)
   #=========================================================