Allow user to choose GDCM1/GDCM2 (default : GDCM1)

diff --git a/Install/creatools.sh_TEMPLATE b/Install/creatools.sh_TEMPLATE
index b5b3dab61957df83386fd21883b96f64a813367a..22d7025f5dc94e87f351550b7e12f35b7308bb5b 100644 (file)
--- a/Install/creatools.sh_TEMPLATE
+++ b/Install/creatools.sh_TEMPLATE
@@ -1,4 +1,3 @@
-
 creatoolsGeneration=<directory where you want to generate>
 
 installPrefix=$creatoolsGeneration/creatools_install
@@ -6,14 +5,10 @@ installPrefix=$creatoolsGeneration/creatools_install
 #installPrefix=/usr/local
 
 cvsUser=<USER>
-
 docGeneration=<OFF|ON> let it to OFF!
-
 buildType=<Release|Debug>
-
-
-
+gdcmVersion=<GDCM1|GDCM2>
 
 cd scripts
-sh All.sh $creatoolsGeneration $docGeneration $cvsUser $installPrefix $buildType
+sh All.sh $creatoolsGeneration $docGeneration $cvsUser $installPrefix $buildType $gdcmVersion
 cd ..

diff --git a/Install/scripts/All.sh b/Install/scripts/All.sh
index 8fffc7fe3bf7e263eaab92b5c12a9acd0188c6a6..586ccad9afaa525a4a299f1e47d999d6e4afc6f5 100644 (file)
--- a/Install/scripts/All.sh
+++ b/Install/scripts/All.sh
@@ -3,10 +3,11 @@
 if [ $# = 0 ]
 then
 echo "Use it as :"
-echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <installPrefix> <buildType>"
+echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <installPrefix> <buildType> <GDCM Version>"
 echo "with 'installPrefix' : /usr/local or <directory where you want to generate>/creatools_install"
+echo "with 'GDCM Version' : GDCM1 / GDCM2"
 echo " "
-echo "ex : sh All.sh /tmp/gendir OFF jpr /tmp/gendir/creatools_install Debug"
+echo "ex : sh All.sh /tmp/gendir OFF jpr /tmp/gendir/creatools_install Debug GDCM2"
 exit 0
 fi
 
@@ -18,14 +19,15 @@ echo $2
 echo $3
 echo $4
 echo $5
+echo $6
 echo "----------"
 
-if [ $# != 5 ]
+if [ $# != 6 ]
 then 
-echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <installPrefix> <buildType>"
+echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <installPrefix> <buildType> <GDCM Version>"
 echo "with 'installPrefix' : /usr/local or <directory where you want to generate>/creatools_install"
 echo " "
-echo "ex : sh All.sh /tmp/gendir OFF jpr /tmp/gendir/creatools_install Debug"
+echo "ex : sh All.sh /tmp/gendir OFF jpr /tmp/gendir/creatools_install Debug GDCM2"
 exit 0
 fi
 
@@ -38,6 +40,7 @@ generationdir=$1
 cvsUserName=$3
 installPrefix=$4
 buildType=$5
+gdcmVersion=$6
 
 scriptDir=$PWD
 echo scriptDir
@@ -91,7 +94,6 @@ then
 fi
 fi
 
-
 # --------------------------------
 #         start_point = 1 : remove everything but source files
 #---------------------------------
@@ -182,7 +184,7 @@ if [ true = true ]
 then
 # BBTK
  sh cmakemod.sh        $bbtksource $generationdir $installPrefix $buildType 
- sh bbtkVariables.sh   $bbtksource $generationdir $docgeneration
+ sh bbtkVariables.sh   $bbtksource $generationdir $docgeneration $gdcmVersion
  sh compilemod.sh      $buildType $bbtksource $generationdir 
  sh ctestmod.sh                $bbtksource $generationdir
 fi
@@ -242,7 +244,7 @@ if [ true = true ]
 then
 # creaBruker
  sh cmakemod.sh                 $creabrukersource $generationdir $installPrefix $buildType 
- sh creaBrukerVariables.sh     $creabrukersource $generationdir $docgeneration
+ sh creaBrukerVariables.sh     $creabrukersource $generationdir $docgeneration $gdcmVersion
  sh compilemod.sh $buildType    $creabrukersource  $generationdir
  echo generationdir 
  sh ctestmod.sh                 $creabrukersource $generationdir
@@ -263,7 +265,7 @@ if [ true = true ]
 then
 # creaImageIO
  sh cmakemod.sh                $creaimagesource $generationdir $installPrefix $buildType 
- sh creaImageIOVariables.sh    $creaimagesource $generationdir $docgeneration
+ sh creaImageIOVariables.sh    $creaimagesource $generationdir $docgeneration $gdcmVersion
  sh compilemod.sh              $buildType $creaimagesource $generationdir
  sh ctestmod.sh                $creaimagesource $generationdir
 fi

diff --git a/Install/scripts/bbtkVariables.sh b/Install/scripts/bbtkVariables.sh
index fd19334e7799d9f9832ae327415695d535a3a2cb..6495677d7a67ee678421f0737b799a60f2358e8e 100644 (file)
--- a/Install/scripts/bbtkVariables.sh
+++ b/Install/scripts/bbtkVariables.sh
@@ -3,12 +3,23 @@
 # $1 : bbtk
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
+# $4 : GDCM1 / GDCM2
 
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
+# use GDCM1 as default !
+if [ $4 = "GDCM2" ]
+then
+boolgdcm2 = ON
+boolgdcm1 = OFF
+else
+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 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 CMakeCache.txt
 cmake CMakeCache.txt

diff --git a/Install/scripts/creaBrukerVariables.sh b/Install/scripts/creaBrukerVariables.sh
index 1be2e2443457a03512a926c919b6dd802aa92596..0dda242bf9359fc454c1f6bd7fdcc8b703bcaeda 100644 (file)
--- a/Install/scripts/creaBrukerVariables.sh
+++ b/Install/scripts/creaBrukerVariables.sh
@@ -1,12 +1,24 @@
 # $1 : creaBruker
 # $2 : generationdir
 # $3 : ON/OFF (generate doc)
+# $4 : GDCM1 / GDCM2
 
 binfolder=$2/creatools_bin/$1Bin
 cd $binfolder
 
+# use GDCM1 as default !
+if [ $4 = "GDCM2" ]
+then
+boolgdcm2 = ON
+boolgdcm1 = OFF
+else
+boolgdcm2 = OFF
+boolgdcm1 = ON
+fi
+
+
 #cmake -D BUILD_ALL:BOOL=OFF                            CMakeCache.txt
-cmake -D BUILD_creaBruker_DOC:BOOL=$3                  CMakeCache.txt
+cmake -D BUILD_creaBruker_DOC: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_DOXYGEN_DOC:BOOL=$3                     CMakeCache.txt
 

diff --git a/Install/scripts/creaImageIOVariables.sh b/Install/scripts/creaImageIOVariables.sh
index 906ca881cac3375d018355f0d878591f4e0eb9e7..6f8562b06b210f8f0d82240374ed0f4506021eea 100644 (file)
--- 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/creatools_bin/$1Bin
 cd $binfolder
 
+# 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