From dbc17ccf7ebbbea53ee77802ea1c8667c01f8d9b Mon Sep 17 00:00:00 2001 From: davila Date: Tue, 22 Jul 2014 09:03:36 +0200 Subject: [PATCH] conflict gdcm and vtk version --- Linux/installscript | 9 +++++++-- Linux/scripts/ThirdParty-install-gdcm.sh | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Linux/installscript b/Linux/installscript index 8f9ae93..4823c02 100755 --- a/Linux/installscript +++ b/Linux/installscript @@ -23,6 +23,8 @@ #!/bin/bash -e +scriptDirName=$(dirname $(readlink -f $0) ) + ######################################################################### ############ Local Functions ####################################### ######################################################################### @@ -347,16 +349,19 @@ if [ `checkVal $command all 3rd 3rd-base` == true ] ; then fi + # vtk if [ `checkVal $command all 3rd 3rd-vtk` == true ] ; then bigDisplay "INSTALL VTK" - bash scripts/ThirdParty-install-VTK.sh + source scripts/ThirdParty-install-VTK.sh + cd $scriptDirName fi # gdcm if [ `checkVal $command all 3rd 3rd-gdcm` == true ] ; then bigDisplay "INSTALL $gdcmVersion" - bash scripts/ThirdParty-install-gdcm.sh + source scripts/ThirdParty-install-gdcm.sh + cd $scriptDirName fi # itk diff --git a/Linux/scripts/ThirdParty-install-gdcm.sh b/Linux/scripts/ThirdParty-install-gdcm.sh index a289ad7..18771ac 100644 --- a/Linux/scripts/ThirdParty-install-gdcm.sh +++ b/Linux/scripts/ThirdParty-install-gdcm.sh @@ -127,7 +127,7 @@ then cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/ ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/ cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefixThird CMakeCache.txt - cmake -D VTK_DIR:PATH=$dirInstallVTK CMakeCache.txt + cmake -D VTK_DIR:PATH=$VTK_DIR CMakeCache.txt cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt make -j $corenumber make install -- 2.44.0