X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_all.sh;h=d430a5cad4192b32b34fce451e4fa27e320397ab;hb=cb120dc0de76631b51a30ec7bfb6d9ed20d826a3;hp=967fdf65d6ab5062a730df2f7d02192c7f84d9e0;hpb=b1221fc4fada58c99f998cc6fdfeaca3425b8437;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_all.sh b/Install_ThirdParty/scripts/install_thirdparty_all.sh
index 967fdf6..d430a5c 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_all.sh
+++ b/Install_ThirdParty/scripts/install_thirdparty_all.sh
@@ -44,7 +44,7 @@ OS=$4
 scriptDir=$PWD
 sourcesDir=$generationdir/thirdparty_sources
 binDir=$generationdir/thirdparty_bin
-THIRDPARTY_INSTALL_DIR=$installPrefix/thirdparty_install
+
 
 mkdir $generationdir
 mkdir $sourcesDir
@@ -89,6 +89,7 @@ then
      sudo apt-get --yes install libboost-all-dev #Boost
      sudo apt-get --yes install libqt4-dev #QT4
      sudo apt-get --yes install sqlite
+     sudo apt-get --yes install libsqlite0-dev
      sudo apt-get --yes install libosmesa6-dev #Mesa6
      sudo apt-get --yes install uuid-dev # uuid para la instalacion de itk
      sudo apt-get --yes install libxaw7-dev # X11
@@ -194,23 +195,23 @@ fi
 
 #deal with create creatools_third_party_libraries_config.sh
 
-sudo touch     $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo chmod 666 $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
+sudo touch     $installPrefix/share/creatools_third_party_library_config.sh
+sudo chmod 666 $installPrefix/share/creatools_third_party_library_config.sh
 
-sudo echo export PATH='$'PATH:$THIRDPARTY_INSTALL_DIR/bin             >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export VTK_DIR=$THIRDPARTY_INSTALL_DIR/lib/vtk-5.6          >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export ITK_DIR=$THIRDPARTY_INSTALL_DIR/lib/InsightToolkit   >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export GDCM_DIR=$THIRDPARTY_INSTALL_DIR/lib/gdcm            >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR         >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR          >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
-sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR          >> $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh
+sudo echo export PATH='$'PATH:$installPrefix/bin            	>> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export VTK_DIR=$installPrefix/lib/vtk-5.6         	>> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export ITK_DIR=$installPrefix/lib/InsightToolkit  	>> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export GDCM_DIR=$installPrefix/lib/gdcm            	>> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$GDCM_DIR  	>> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$ITK_DIR  	>> $installPrefix/share/creatools_third_party_library_config.sh
+sudo echo export LD_LIBRARY_PATH='$'LD_LIBRARY_PATH:$VTK_DIR   	>> $installPrefix/share/creatools_third_party_library_config.sh
 
 #  modify .bashrc
-# - remove line 'sh $installPrefix/thirdparty_install/share/creatools_third_party_libraries_config.sh' if any (with accurate value for ???)
+# - remove line 'sh $installPrefix/share/creatools_third_party_library_config.sh' if any (with accurate value for ???)
 sed -i -e '/.*creatools_third_party_library_config.*/ d' ~/.bashrc
 
-# - add line 'sh $installPrefix/thirdparty_install/share/creatools_third_party_libraries_config.sh' (with accurate value for ???)
-echo source $THIRDPARTY_INSTALL_DIR/share/creatools_third_party_library_config.sh >> ~/.bashrc 
+# - add line 'sh $installPrefix/share/creatools_third_party_library_config.sh' (with accurate value for ???)
+echo source $installPrefix/share/creatools_third_party_library_config.sh >> ~/.bashrc