From: Hans Johnson Date: Sat, 31 May 2014 14:01:12 +0000 (-0500) Subject: COMP: Update ITK and VTK X-Git-Tag: v1.4.0~118 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b054222209d98db6dd10a8ba4d25d3c0473e24ec;p=clitk.git COMP: Update ITK and VTK ITK and VTK updates allow building with c++11 on mavericks with the latest apple clang compiler. --- diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt index b0710d7..c90b286 100644 --- a/superbuild/CMakeLists.txt +++ b/superbuild/CMakeLists.txt @@ -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}