fixes

diff --git a/Linux/menu.sh b/Linux/menu.sh
index c73e43cefcff14ed9c65bea4577ab5d9d771fc99..4b5539bbdbba45f41ad7eacc3db513273c7c7e2a 100644 (file)
--- a/Linux/menu.sh
+++ b/Linux/menu.sh
@@ -50,6 +50,7 @@ do
   else
      suitable="NO"
   fi
+  
   if [ "$suitable" = "YES" ]
   then
      source scripts/CreaTools-configure.sh

diff --git a/Linux/scripts/CreaTools-compile.sh b/Linux/scripts/CreaTools-compile.sh
index aea3c4724dbdf617c247214934849db6451c80c5..1d6265eee26eabbfda1f7ef8e7b1c665fbe8b029 100644 (file)
--- a/Linux/scripts/CreaTools-compile.sh
+++ b/Linux/scripts/CreaTools-compile.sh
@@ -54,6 +54,12 @@ fi
    exit 0
 fi
 
+ cd $generationdir
+ if [ -e creatools_bin ]
+ then
+    rm -rf creatools_bin
+ fi
+ mkdir creatools_bin
 
 cd $scriptDir
 
@@ -87,10 +93,10 @@ then
 if [ true = true ]
 then
 # BBTK
- sh $scriptDir/cmakemod.sh       $bbtksource $generationdir $installPrefix $buildType
- sh $scriptDir/bbtkVariables.sh  $bbtksource $generationdir $docgeneration $gdcmVersion
- sh $scriptDir/compilemod.sh     $buildType  $bbtksource $generationdir
- sh $scriptDir/ctestmod.sh       $bbtksource $generationdir
+ sh $scriptDir/cmakemod.sh               $bbtksource $generationdir $installPrefix $buildType
+ sh $scriptDir/bbtkVariables.sh          $bbtksource $generationdir $docgeneration $gdcmVersion
+ sh $scriptDir/compilemod.sh  $buildType $bbtksource $generationdir
+ sh $scriptDir/ctestmod.sh               $bbtksource $generationdir
 fi
 fi
  bbtkdll=$generationdir/creatools_bin/bbtkBin
@@ -107,10 +113,10 @@ then
 if [ true = true ]
 then
 # creaMaracasVisu
- sh $scriptDir/cmakemod.sh                $creamaracassource $generationdir $installPrefix $buildType 
- sh $scriptDir/creaMaracasVariables.sh    $creamaracassource $generationdir $docgeneration
- sh $scriptDir/compilemod.sh              $buildType $creamaracassource $generationdir
- sh $scriptDir/ctestmod.sh                $creamaracassource $generationdir
+ sh $scriptDir/cmakemod.sh              $creamaracassource $generationdir $installPrefix $buildType 
+ sh $scriptDir/creaMaracasVariables.sh  $creamaracassource $generationdir $docgeneration
+ sh $scriptDir/compilemod.sh $buildType $creamaracassource $generationdir
+ sh $scriptDir/ctestmod.sh              $creamaracassource $generationdir
 fi
 fi
  creamaracasdll=$generationdir/creatools_bin/creamaracasBin

diff --git a/Linux/scripts/bbtkVariables.sh b/Linux/scripts/bbtkVariables.sh
index b909349d3abc8d8d12b3ea5116d431553628ec45..96d9db100eb716368cf1e9d6832b471d959f469d 100644 (file)
--- a/Linux/scripts/bbtkVariables.sh
+++ b/Linux/scripts/bbtkVariables.sh
@@ -5,12 +5,9 @@
 # $3 : ON/OFF (generate doc)
 # $4 : GDCM1 / GDCM2
 
-
-
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-
 # use GDCM1 as default !
 if [ $4 = GDCM2 ]
 then
@@ -21,7 +18,6 @@ boolgdcm2=OFF
 boolgdcm1=ON
 fi
 
-
 cmake -D crea_DIR:PATH=$2/creatools_bin/creaBin CMakeCache.txt
 cmake -D --BUILD_ALL:BOOL=ON CMakeCache.txt
 cmake -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1 -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
@@ -34,5 +30,3 @@ cmake CMakeCache.txt
 cmake -D --BUILD_ALL:BOOL=OFF -D BUILD_BBTK_DOC:BOOL=$3 CMakeCache.txt
 
 cd ..
-
-