X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install_no_compile.sh;h=16f6e5e5de2c99890980f0dbacb686b10d5501da;hb=5ceecf6dda6a78fc6cefb8e9f8774f2a287a3729;hp=b06b71a2943de3540b53cf6b0dce08413897c0e2;hpb=b09ac6096e0e160da27ebeff3732c465244a7765;p=creaToolsTools.git diff --git a/Linux/scripts/ThirdParty-install_no_compile.sh b/Linux/scripts/ThirdParty-install_no_compile.sh index b06b71a..16f6e5e 100644 --- a/Linux/scripts/ThirdParty-install_no_compile.sh +++ b/Linux/scripts/ThirdParty-install_no_compile.sh @@ -20,6 +20,8 @@ source $PWD/scripts/CreaTools-configure.sh echo $PWD/scripts/CreaTools-configure.sh echo --generationdir-- echo $generationdir + echo --corenumber-- + echo $corenumber echo --docgeneration-- echo $docgeneration echo --installPrefix-- @@ -30,6 +32,8 @@ source $PWD/scripts/CreaTools-configure.sh echo $buildType echo --gdcmVersion-- echo $gdcmVersion + echo "--ETC_BASHRC--" + echo $ETC_BASHRC # echo --sourcesFrom-- # echo $sourcesFrom # echo --scriptDir-- @@ -37,7 +41,7 @@ source $PWD/scripts/CreaTools-configure.sh # echo --start_point-- # echo $start_point echo "------" - + scriptDir=$PWD sourcesDir=$generationdir/thirdparty_sources binDir=$generationdir/thirdparty_bin @@ -61,21 +65,22 @@ echo export GDCM_DIR=$installPrefixThird/lib/gdcm >> $installPrefixThir echo export TTH=$installPrefixThird/bin/tth >> $installPrefixThird/share/creatools_third_party_library_config.sh if [ $OperatingSystem = "MacOS" ] then -echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$GDCM_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh -echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$ITK_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh -echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$VTK_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh + echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$GDCM_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh + echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$ITK_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh + echo export DYLD_LIBRARY_PATH='$'DYLD_LIBRARY_PATH:$VTK_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh else -echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh -echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh -echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh + echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh + echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh + echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR >> $installPrefixThird/share/creatools_third_party_library_config.sh fi -if [ $OperatingSystem = "MacOS" ] -then -export ETC_BASHRC=$HOME/.profile -else -export ETC_BASHRC=$HOME/.bashrc -fi +# done in CreaTools-configure.sh JPR +#if [ $OperatingSystem = "MacOS" ] +#then +# export ETC_BASHRC=$HOME/.profile +#else +# export ETC_BASHRC=$HOME/.bashrc +#fi sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC