X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=superbuild%2FCMakeLists.txt;h=b0710d75af596e8ee39bda4b9207486871921a8b;hb=4cfd18a5e026b6b20a4dfbdd32606b0fc18883b5;hp=f4727a83a1bc0ded2f65e732899fcdb425353498;hpb=066bd4aaccac469831ac6aa535dbf7f7939be78e;p=clitk.git

diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt
index f4727a8..b0710d7 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")
@@ -69,7 +70,7 @@ SET(qmake_executable "${build_prefix}/QT/bin/qmake")
 
 #=========================================================
 # VTK
-SET(VTK_CMAKE_CXX_STANDARD_LIBRARIES "${VTK_CMAKE_CXX_STANDARD_LIBRARIES}")
+SET(VTK_CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES}")
 IF(MSVC)
   SET(VTK_CMAKE_CXX_STANDARD_LIBRARIES "${VTK_CMAKE_CXX_STANDARD_LIBRARIES} Imm32.lib Winmm.lib Ws2_32.lib")
 ENDIF(MSVC)
@@ -102,13 +103,36 @@ 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.4
+   INSTALL_COMMAND ""
+   CMAKE_ARGS
+   -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}
@@ -140,15 +164,21 @@ if(CMAKE_COMPILER_IS_GNUCXX)
   SET(VV_CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
+SET(MAKE_COMMAND "make")
+if(MSVC)
+  SET(MAKE_COMMAND "nmake")
+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 HEAD
-  INSTALL_COMMAND ""
+  INSTALL_DIR ${install_prefix}
+  INSTALL_COMMAND  make install 
   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}