X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FbbtkVariables.sh;h=b909349d3abc8d8d12b3ea5116d431553628ec45;hb=a5fce6cfe871e7dee66e6e7c064ef9e632a5c192;hp=6495677d7a67ee678421f0737b799a60f2358e8e;hpb=18208e3664c8262d09362d3a182036d7a1b3e02c;p=creaToolsTools.git

diff --git a/Install/scripts/bbtkVariables.sh b/Install/scripts/bbtkVariables.sh
index 6495677..b909349 100644
--- a/Install/scripts/bbtkVariables.sh
+++ b/Install/scripts/bbtkVariables.sh
@@ -5,23 +5,34 @@
 # $3 : ON/OFF (generate doc)
 # $4 : GDCM1 / GDCM2
 
+
+
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
+
 # use GDCM1 as default !
-if [ $4 = "GDCM2" ]
+if [ $4 = GDCM2 ]
 then
-boolgdcm2 = ON
-boolgdcm1 = OFF
+boolgdcm2=ON
+boolgdcm1=OFF
 else
-boolgdcm2 = OFF
-boolgdcm1 = ON
+boolgdcm2=OFF
+boolgdcm1=ON
 fi
 
-cmake -D --BUILD_ALL:BOOL=ON   -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 -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1 CMakeCache.txt
 
+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
+cmake CMakeCache.txt
+cmake CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
 cmake CMakeCache.txt
+cmake CMakeCache.txt
+cmake -D --BUILD_ALL:BOOL=OFF -D BUILD_BBTK_DOC:BOOL=$3 CMakeCache.txt
+
 cd ..
+
+