X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Linux%2Fscripts%2FThirdParty-install_no_compile.sh;h=01c4636fa1d536e45c1fa3f1092e86e5310f3a06;hb=2778417a909f19f22a8ba4d6d8bdc1fa3982b926;hp=16f6e5e5de2c99890980f0dbacb686b10d5501da;hpb=5ceecf6dda6a78fc6cefb8e9f8774f2a287a3729;p=creaToolsTools.git

diff --git a/Linux/scripts/ThirdParty-install_no_compile.sh b/Linux/scripts/ThirdParty-install_no_compile.sh
index 16f6e5e..01c4636 100644
--- a/Linux/scripts/ThirdParty-install_no_compile.sh
+++ b/Linux/scripts/ThirdParty-install_no_compile.sh
@@ -60,9 +60,15 @@ chmod 755 $installPrefixThird/share/creatools_third_party_library_config.sh
 
 echo export PATH='$'PATH:$installPrefixThird/bin           >> $installPrefixThird/share/creatools_third_party_library_config.sh
 echo export VTK_DIR=$installPrefixThird/lib/vtk-5.6        >> $installPrefixThird/share/creatools_third_party_library_config.sh
-echo export ITK_DIR=$installPrefixThird/lib/InsightToolkit >> $installPrefixThird/share/creatools_third_party_library_config.sh
+if [ $ITKVersion = ITK3 ]
+then
+   echo export ITK_DIR=$installPrefixThird/lib/InsightToolkit >> $installPrefixThird/share/creatools_third_party_library_config.sh
+else
+   echo export ITK_DIR=$installPrefixThird/lib/               >> $installPrefixThird/share/creatools_third_party_library_config.sh
+fi
 echo export GDCM_DIR=$installPrefixThird/lib/gdcm          >> $installPrefixThird/share/creatools_third_party_library_config.sh
 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
@@ -74,13 +80,16 @@ else
    echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR    >> $installPrefixThird/share/creatools_third_party_library_config.sh
 fi
 
-#   done in CreaTools-configure.sh JPR
-#if [ $OperatingSystem = "MacOS" ]
-#then
-#   export ETC_BASHRC=$HOME/.profile
-#else
-#   export ETC_BASHRC=$HOME/.bashrc
-#fi
+export VTK_DIR=$installPrefixThird/lib/vtk-5.6
+if [ $ITKVersion = ITK3 ]
+then
+   export ITK_DIR=$installPrefixThird/lib/InsightToolkit
+else
+   export ITK_DIR=$installPrefixThird/lib/
+fi
+
+export GDCM_DIR=$installPrefixThird/lib/gdcm
+export TTH=$installPrefixThird/bin/tth
 
    sed -i -e '/.*installPrefixThird*/ d' $ETC_BASHRC
    sed -i -e '/.*creatools_third_party_library_config.*/ d' $ETC_BASHRC