X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_all.sh;h=0154ffcef6e3150acb2b32aa196ace78b0a410c3;hb=322ef7eb18cf1799493d3a27ce919a3904e6c207;hp=53510de955ebc95e09f7707c02a382d9d8c718b0;hpb=d013809044128c4243e53ca87a3c9d235928b42f;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.sh b/Install_ThirdParty/scripts/install_thirdparty_all.sh
index 53510de..0154ffc 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_all.sh
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.sh
@@ -50,7 +50,7 @@ mkdir $generationdir
 mkdir $sourcesDir
 mkdir $binDir
 
-sudo rm        $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
+rm $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
 
 
 
@@ -122,14 +122,17 @@ fi
 # the following stupid test is used at debug time; Please don't remove!
 if [ true = true ]
 then
-  rm -rf $sources/VTK*
-  rm -rf $sources/vtk*
-  rm -rf $sources/InsightToolkit*
-  rm -rf $sources/gdcm*
+  rm -rf $sourcesDir/VTK*
+  rm -rf $sourcesDir/vtk*
+  rm -rf $sourcesDir/InsightToolkit*
+  rm -rf $sourcesDir/gdcm*
+  rm -rf $sourcesDir/tth*
   cd $sourcesDir
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/vtk-5.6.1.tar.gz
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/gdcm_08_Dic_2009.tar.gz
   wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_ThirdParty_Libraries/source/InsightToolkit-3.20.0.tar.gz
+  wget http://www.creatis.insa-lyon.fr/software/public/creatools/crea_Developer_Tools/All_Versions/tth/tth_linux/tth
+
   tar -xvzf vtk-5.6.1.tar.gz
   tar -xvzf gdcm_08_Dic_2009.tar.gz
   tar -xvzf InsightToolkit-3.20.0.tar.gz
@@ -157,7 +160,7 @@ then
   cmake -D USE_DEBUG_LIB:BOOL=$buildType -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D VTK_USE_QT:BOOL=ON CMakeCache.txt
   make -j 2
-  sudo make install
+  make install
   cd ..
 fi
 
@@ -173,7 +176,7 @@ then
   cmake -D VTK_DIR:PATH=$dirInstallVTK CMakeCache.txt
   cmake -D GDCM_VTK:BOOL=ON -D GDCM_NAME_SPACE:STRING=gdcm13 CMakeCache.txt
   make -j 2
-  sudo make install
+  make install
   cd ..
 fi
 
@@ -189,19 +192,27 @@ then
   cmake -D BUILD_EXAMPLES:BOOL=OFF -D BUILD_TESTING:BOOL=OFF -D BUILD_SHARED_LIBS:BOOL=ON -D ITK_USE_REVIEW:BOOL=ON CMakeCache.txt
   cmake CMakeCache.txt
   make -j 2
-  sudo make install
+  make install
   cd ..
 fi
 
+
+if [ true = true ]
+then
+  cd $sourcesDir
+  cp tth $installPrefix/bin
+fi
+
 #deal with create creatools_third_party_libraries_config.sh
 
 touch     $installPrefix/share/creatools_third_party_library_config.sh
 chmod 666 $installPrefix/share/creatools_third_party_library_config.sh
 
-echo export PATH='$'PATH:$installPrefix/bin            	>> $installPrefix/share/creatools_third_party_library_config.sh
-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 PATH='$'PATH:$installPrefix/bin            		>> $installPrefix/share/creatools_third_party_library_config.sh
+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 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