]> Creatis software - clitk.git/commitdiff
COMP: Update ITK and VTK
authorHans Johnson <hans-johnson@uiowa.edu>
Sat, 31 May 2014 14:01:12 +0000 (09:01 -0500)
committerHans Johnson <hans-johnson@uiowa.edu>
Thu, 5 Jun 2014 15:48:08 +0000 (10:48 -0500)
ITK and VTK updates allow building with c++11 on
mavericks with the latest apple clang compiler.

superbuild/CMakeLists.txt

index b0710d75af596e8ee39bda4b9207486871921a8b..c90b2867ef6f76f35439dac053193ea0c12913de 100644 (file)
@@ -40,10 +40,7 @@ find_package(Git REQUIRED)
 
 #=========================================================
 # QT
-SET(QtWinSpecFiles "${source_prefix}/qt/mkspecs/win32-msvc2003/qmake.conf";
-                   "${source_prefix}/qt/mkspecs/win32-msvc2005/qmake.conf";
-                   "${source_prefix}/qt/mkspecs/win32-msvc2008/qmake.conf";
-                   "${source_prefix}/qt/mkspecs/win32-msvc2010/qmake.conf")
+SET(QtWinSpecFiles "${source_prefix}/qt/mkspecs/win32-msvc2003/qmake.conf;${source_prefix}/qt/mkspecs/win32-msvc2005/qmake.conf;${source_prefix}/qt/mkspecs/win32-msvc2008/qmake.conf;${source_prefix}/qt/mkspecs/win32-msvc2010/qmake.conf")
 ExternalProject_Add(
   QT
   SOURCE_DIR ${source_prefix}/qt
@@ -79,7 +76,7 @@ ExternalProject_Add(
   DEPENDS QT
   SOURCE_DIR ${source_prefix}/vtk
   GIT_REPOSITORY git://vtk.org/VTK.git
-  GIT_TAG v5.10.0
+  GIT_TAG v5.10.1
   INSTALL_COMMAND ""
   CMAKE_ARGS
     -DQT_QMAKE_EXECUTABLE:FILEPATH=${qmake_executable}
@@ -132,7 +129,7 @@ ExternalProject_Add(
   ITK
   SOURCE_DIR ${source_prefix}/itk
   GIT_REPOSITORY git://itk.org/ITK.git
-  GIT_TAG v4.4.0
+  GIT_TAG v4.5.2
   INSTALL_COMMAND ""
   CMAKE_ARGS
     -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}