X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=superbuild%2FCMakeLists.txt;h=a3d5dfe7fb0151d82618ea1aa77668244706c9f3;hb=4cc4b061cd3a55c91f3f09256f68336a2a748d4f;hp=08e85ed57bfa9cadd8196441220f5b4cc067ce80;hpb=f1cebc71809c5218578a58486f829980eeb29ab3;p=clitk.git

diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt
index 08e85ed..a3d5dfe 100644
--- a/superbuild/CMakeLists.txt
+++ b/superbuild/CMakeLists.txt
@@ -62,6 +62,7 @@ ExternalProject_Add(
                                                   -no-libtiff
                                                   -no-libjpeg
                                                   -no-libmng
+                                                  -no-glib
   INSTALL_COMMAND ""
 )
 SET(qmake_executable "${build_prefix}/QT/bin/qmake")
@@ -102,13 +103,37 @@ ExternalProject_Add(
 SET(VTK_DIR ${build_prefix}/VTK)
 #=========================================================
 
+#=========================================================
+# GDCM
+   ExternalProject_Add(
+   GDCM
+   SOURCE_DIR ${source_prefix}/gdcm
+   GIT_REPOSITORY git://git.code.sf.net/p/gdcm/gdcm 
+   GIT_TAG v2.2.3
+   INSTALL_COMMAND ""
+   CMAKE_ARGS
+   -DQT_QMAKE_EXECUTABLE:FILEPATH=${qmake_executable}
+   -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
+   -DCMAKE_C_FLAGS_MINSIZEREL:STRING=${CMAKE_C_FLAGS_MINSIZEREL}
+   -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}
+   -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO}
+   -DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG}
+   -DCMAKE_CXX_FLAGS_MINSIZEREL:STRING=${CMAKE_CXX_FLAGS_MINSIZEREL}
+   -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}
+   -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+   -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_PREFIX}
+   -DCMAKE_BUILD_TYPE:STRING=${build_type}
+)
+SET(GDCM_DIR ${build_prefix}/GDCM)
+#=========================================================
+
 #=========================================================
 # ITK
 ExternalProject_Add(
   ITK
   SOURCE_DIR ${source_prefix}/itk
   GIT_REPOSITORY git://itk.org/ITK.git
-  GIT_TAG v4.2.0
+  GIT_TAG v4.4.0
   INSTALL_COMMAND ""
   CMAKE_ARGS
     -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
@@ -147,13 +172,13 @@ endif(MSVC)
 
 ExternalProject_Add(
   VV
-  DEPENDS QT VTK ITK
+  DEPENDS QT VTK ITK GDCM
   SOURCE_DIR ${source_prefix}/vv
   GIT_REPOSITORY git://git.creatis.insa-lyon.fr/clitk
-  GIT_TAG v1.3.0
   INSTALL_COMMAND ${MAKE_COMMAND} package
   CMAKE_ARGS
     -DQT_QMAKE_EXECUTABLE:FILEPATH=${qmake_executable}
+    -DGDCM_DIR:PATH=${GDCM_DIR}
     -DITK_DIR:PATH=${ITK_DIR}
     -DVTK_DIR:PATH=${VTK_DIR}
     -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
@@ -170,6 +195,10 @@ ExternalProject_Add(
     -DCMAKE_BUILD_TYPE:STRING=${build_type}
     -DBUILD_SHARED_LIBS:BOOL=OFF
     -DBUILD_TESTING:BOOL=OFF
+    -DCLITK_BUILD_REGISTRATION:BOOL=ON
+    -DCLITK_BUILD_SEGMENTATION:BOOL=ON
+    -DCLITK_BUILD_TOOLS:BOOL=ON
+    -DCLITK_BUILD_EXPERIMENTAL:BOOL=ON
 )
 #=========================================================