X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_all.sh;h=b96d003339b472629f9eec1c0dc2fadd04243d1e;hb=eb32b3dc49cda5356c52ed045e8ff13fa1e374dd;hp=a33f03a5e7e839c687f05981a21ef431b83954b2;hpb=f5d45941ca1df2f6d337b0dc6c63916c29ab1853;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.sh b/Install_ThirdParty/scripts/install_thirdparty_all.sh
index a33f03a..b96d003 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_all.sh
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.sh
@@ -49,7 +49,7 @@ mkdir $generationdir
 mkdir $sourcesDir
 mkdir $binDir
 
-rm $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
+rm $installPrefix/share/creatools_third_party_library_config.sh
 
 
 
@@ -152,7 +152,7 @@ then
   libname=VTK
   dirInstall=$binDir/$libname-Bin
   dirInstallVTK=$dirInstall
-  mkdir $dirInstall
+  VTK_DIR=$installPrefix/lib/vtk-5.6/
   cd $dirInstall
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
   ##cmake -G"CodeBlocks - Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
@@ -167,6 +167,7 @@ if [ true = true ]
 then
   libname=gdcm
   dirInstall=$binDir/$libname-Bin
+  GDCM_DIR=$installPrefix/lib/gdcm/
   mkdir $dirInstall
   cd $dirInstall
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
@@ -183,6 +184,7 @@ if [ true = true ]
 then
   libname=InsightToolkit-3.20.0
   dirInstall=$binDir/$libname-Bin
+  ITK_DIR=$installPrefix/lib/InsightToolkit/
   mkdir $dirInstall
   cd $dirInstall
   cmake -G"Unix Makefiles" -H$sourcesDir/$libname -B$dirInstall/
@@ -211,7 +213,7 @@ echo export PATH='$'PATH:$installPrefix/bin            		>> $installPrefix/share
 echo export VTK_DIR=$installPrefix/lib/vtk-5.6         		>> $installPrefix/share/creatools_third_party_library_config.sh
 echo export ITK_DIR=$installPrefix/lib/InsightToolkit  		>> $installPrefix/share/creatools_third_party_library_config.sh
 echo export GDCM_DIR=$installPrefix/lib/gdcm            	>> $installPrefix/share/creatools_third_party_library_config.sh
-echo export TTH=$installPrefix/bin/tth     		    	    >> $installPrefix/share/creatools_third_party_library_config.sh
+echo export TTH=$installPrefix/bin/tth     		    	>> $installPrefix/share/creatools_third_party_library_config.sh
 echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR  	>> $installPrefix/share/creatools_third_party_library_config.sh
 echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR  	>> $installPrefix/share/creatools_third_party_library_config.sh
 echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR   	>> $installPrefix/share/creatools_third_party_library_config.sh