]> Creatis software - creaToolsTools.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 1 Nov 2010 10:14:30 +0000 (10:14 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Mon, 1 Nov 2010 10:14:30 +0000 (10:14 +0000)
Install/scripts/All.sh
Install/scripts/bbtkVariables.sh

index 53ecfc71dcf97f5a13c7efbefb937578687ee26a..47c91029a97dfbfcd8211c4b727a133a4f9e40ed 100644 (file)
@@ -64,7 +64,7 @@ if [ true = true ]
 then
   sudo rm -rf creatools_bin/creaBin
   sudo rm -rf creatools_bin/bbtkBin
-  sudo rm -rf creatools_bin/creamaracasBin
+  sudo rm -rf creatools_bin/creaMaracasBin
   sudo rm -rf creatools_bin/creaEnvironmentBin
   sudo rm -rf creatools_bin/creaBrukerBin
   sudo rm -rf creatools_bin/creaImageIOBin
@@ -77,6 +77,10 @@ then
   sudo rm -rf creatools_install/lib64/creatools
   sudo rm -rf creatools_install/bin/bb*
   sudo rm -rf creatools_install/bin/crea*
+  sudo rm -rf creatools_install/include/bb*
+  sudo rm -rf creatools_install/include/crea*
+  sudo rm -rf creatools_install/share/bb*
+  sudo rm -rf creatools_install/share/crea*
 
 #this is for the old versions EED
   sudo rm -rf creatools_install/lib/crea*
index 862ba1a32007daece2114d97d29ba5ea9e4a5c49..a7260d39e957d763131a3a0943f0339c6e23fcdd 100644 (file)
@@ -8,13 +8,9 @@ binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
 cmake -D --BUILD_ALL:BOOL=ON                           CMakeCache.txt
-cmake -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt
-cmake -D BUILD_BBTK_DOC:BOOL=$3                        CMakeCache.txt
-cmake -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=$3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=$3           CMakeCache.txt
+cmake -D crea_DIR:PATH=$2/creatools_bin/creaBin        CMakeCache.txt
+cmake -D BUILD_BBTK_DOC:BOOL=$3 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=$3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=$3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=$3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=$3 CMakeCache.txt
 
-cmake CMakeCache.txt
-cmake CMakeCache.txt
-cmake CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt