From: Agata Krason Date: Fri, 26 Jul 2013 15:35:46 +0000 (+0200) Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk X-Git-Tag: v1.4.0~164^2~4^2 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=83bd6160ddb570c67b77e4f4c38547d381faed3c;hp=1fcee455f4a6948753d21bacff9b0b72b064667a;p=clitk.git Merge branch 'master' of git.creatis.insa-lyon.fr:clitk --- diff --git a/superbuild/CMakeLists.txt b/superbuild/CMakeLists.txt index a3d5dfe..c1ddf50 100644 --- a/superbuild/CMakeLists.txt +++ b/superbuild/CMakeLists.txt @@ -109,7 +109,7 @@ SET(VTK_DIR ${build_prefix}/VTK) GDCM SOURCE_DIR ${source_prefix}/gdcm GIT_REPOSITORY git://git.code.sf.net/p/gdcm/gdcm - GIT_TAG v2.2.3 + GIT_TAG v2.2.4 INSTALL_COMMAND "" CMAKE_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${qmake_executable} @@ -175,7 +175,8 @@ ExternalProject_Add( DEPENDS QT VTK ITK GDCM SOURCE_DIR ${source_prefix}/vv GIT_REPOSITORY git://git.creatis.insa-lyon.fr/clitk - INSTALL_COMMAND ${MAKE_COMMAND} package + INSTALL_DIR ${install_prefix} + INSTALL_COMMAND make install CMAKE_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${qmake_executable} -DGDCM_DIR:PATH=${GDCM_DIR}