X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FcreaImageIOVariables.sh;h=a1866a48fe4814b409791d3867512d39900d792c;hb=e39aba5fd6b16e2d77886138fcc4ca36b7bbc705;hp=c14ebabf3a04d9411629c435ea16c44bc6c305ff;hpb=a8a68ca1cfe3171654edea57347b5e09cd31f668;p=creaToolsTools.git

diff --git a/Install/scripts/creaImageIOVariables.sh b/Install/scripts/creaImageIOVariables.sh
index c14ebab..a1866a4 100644
--- a/Install/scripts/creaImageIOVariables.sh
+++ b/Install/scripts/creaImageIOVariables.sh
@@ -3,16 +3,27 @@
 # $1 : 'creaImageIO'
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
+# $4 : GDCM1 / GDCM2
 
 currentdir=$2
-binfolder=$2/tmpCreaTools_INSTALL/$1Bin
+binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
-cmake -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin  CMakeCache.txt
-cmake -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin  CMakeCache.txt
-cmake -D creaBruker_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBrukerBin  CMakeCache.txt
+# use GDCM1 as default !
+if [ $4 = "GDCM2" ]
+then
+boolgdcm2=ON
+boolgdcm1=OFF
+else
+boolgdcm2=OFF
+boolgdcm1=ON
+fi
+
+cmake -D crea_DIR:PATH=$currentdir/creatools_bin/creaBin  CMakeCache.txt
+cmake -D BBTK_DIR:PATH=$currentdir/creatools_bin/bbtkBin  CMakeCache.txt
+cmake -D creaBruker_DIR:PATH=$currentdir/creatools_bin/creaBrukerBin  CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON                  CMakeCache.txt
-cmake -D BUILD_creaImageIO_DOC:BOOL=$3                           CMakeCache.txt
+cmake -D BUILD_creaImageIO_DOC:BOOL=$3  -D USE_GDCM2:BOOL=$boolgdcm2 -D USE_GDCM:BOOL=$boolgdcm1                        CMakeCache.txt
 cmake -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=$3      CMakeCache.txt
 
 cmake CMakeCache.txt