From: jean-pierre roux Date: Mon, 20 Jun 2011 09:38:14 +0000 (+0000) Subject: (try to) fix DYLD_LIBRARY_PATH issue X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=a7535beab2160bce1ce3adee0b6517f7c51bd31c;p=creaToolsTools.git (try to) fix DYLD_LIBRARY_PATH issue --- diff --git a/Linux/menu.sh b/Linux/menu.sh index 3aeb7f9..699f5ed 100644 --- a/Linux/menu.sh +++ b/Linux/menu.sh @@ -163,7 +163,6 @@ do read generationdir if [ "$generationdir" = "" ] then - generationdir=$racine fi echo "you said : [" $generationdir "]" @@ -357,6 +356,7 @@ docgeneration="OFF" echo "loginGroupName=$loginGroupName" >> $configureFile echo "buildType=$buildType" >> $configureFile echo "gdcmVersion=$gdcmVersion" >> $configureFile + echo "ETC_BASHRC=$ETC_BASHRC" >> $configureFile # ------------------ # endif 'suitable' @@ -389,6 +389,7 @@ docgeneration="OFF" echo "==>" echo "==> You HAVE to leave current window to continue!" echo "==>" + source $ETC_BASHRC read a kill -9 $PPID ;; @@ -435,6 +436,7 @@ docgeneration="OFF" echo "==>" echo "==> You HAVE to leave current window to continue!" echo "==>" + source $ETC_BASHRC read a kill -9 $PPID ;; @@ -477,6 +479,7 @@ docgeneration="OFF" # else # echo "==> Hit any key to close current window" # fi + source $ETC_BASHRC ;; diff --git a/Linux/scripts/ThirdParty-install-Finalize.sh b/Linux/scripts/ThirdParty-install-Finalize.sh index 2310b2e..06f77fc 100644 --- a/Linux/scripts/ThirdParty-install-Finalize.sh +++ b/Linux/scripts/ThirdParty-install-Finalize.sh @@ -16,8 +16,15 @@ fi source $PWD/scripts/CreaTools-configure.sh -#deal with create creatools_third_party_libraries_config.sh +# /// \TODO move theese ones upper in the process! JPR + +export GDCM_DIR=$installPrefixThird/lib/gdcm/ +export VTK_DIR=$installPrefixThird/lib/vtk-5.6/ +export ITK_DIR=$installPrefixThird/lib/InsightToolkit/ + +#deal with create creatools_third_party_libraries_config.sh +echo "=========================================================installPrefixThird "$installPrefixThird if [ -f $installPrefixThird/share/creatools_third_party_library_config.sh ] then rm $installPrefixThird/share/creatools_third_party_library_config.sh @@ -67,7 +74,7 @@ fi echo installPrefixThird=$installPrefixThird >> $ETC_BASHRC echo '[ -f "$installPrefixThird/share/creatools_third_party_library_config.sh" ] && source $installPrefixThird/share/creatools_third_party_library_config.sh' >> $ETC_BASHRC - +echo "====================================================ETC_BASHRC " $ETC_BASHRC chown -R $loginUserName $generationdir chgrp -R $loginGroupName $generationdir