Merge branch 'master' into GammaIndex3D

[clitk.git] / tools / CMakeLists.txt

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index fbab5f54cfd300f8eb61f1780f30565328020af9..5d67f4b1db35061577199b5cda2f4aff0b6bd3e7 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -90,6 +90,11 @@ if(CLITK_BUILD_TOOLS)
   add_executable(clitkSplitImage clitkSplitImage.cxx clitkSplitImageGenericFilter.cxx ${clitkSplitImage_GGO_C})
   target_link_libraries(clitkSplitImage clitkCommon )
   set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkSplitImage)
+  
+  WRAP_GGO(clitkGammaIndex3D_GGO_C clitkGammaIndex3D.ggo)
+  add_executable(clitkGammaIndex3D clitkGammaIndex3D.cxx clitkGammaIndex3DGenericFilter.cxx ${clitkGammaIndex3D_GGO_C})
+  target_link_libraries(clitkGammaIndex3D clitkCommon )
+  set(TOOLS_INSTALL ${TOOLS_INSTALL} clitkGammaIndex3D)
 
   WRAP_GGO(clitkWriteDicomSeries_GGO_C clitkWriteDicomSeries.ggo)
   add_executable(clitkWriteDicomSeries clitkWriteDicomSeries.cxx ${clitkWriteDicomSeries_GGO_C})
@@ -248,6 +253,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)
@@ -373,20 +388,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)
   #=========================================================