deal with buildType

diff --git a/ctest/dashboard/All.sh b/ctest/dashboard/All.sh
index 3f041272725840e3efd65d8e24c9ca01468f638a..1e23099821ae316799c18fa46966efab87fa0ee4 100644 (file)
--- a/ctest/dashboard/All.sh
+++ b/ctest/dashboard/All.sh
@@ -3,15 +3,15 @@
 if [ $# = 0 ]
 then
 echo "Use it as :"
-echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <VTKdir> <installPrefix>"
+echo "sh All.sh <nameOfTheGenerationDirectory> <BooleanForDocGeneration> <userNameForCVS> <VTKdir> <installPrefix> <buildType>"
 echo " "
 echo "ex : sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
 exit 0
 fi
 
-if [ $# != 5 ]
+if [ $# != 6 ]
 then 
-echo "use it as           sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory"
+echo "use it as           sh All.sh /tmp/gendir OFF jpr /usr/local/lib/vtk-5.4 /home/jpr/myInsallDirectory Release"
 exit 0
 fi
 
@@ -24,14 +24,11 @@ generationdir=$1
 cvsUserName=$3
 VTKdir=$4
 installPrefix=$5
+buildtype=$6
 
 mkdir $generationdir
 mkdir $generationdir/tmpCreaToolsBIN
 
-
-# buildtype, useless for Linux; let here for compatibility purpose
- buildtype=Release
-
  creasource=crea
  bbtksource=bbtk
  creamaracassource=creaMaracasVisu
@@ -43,6 +40,7 @@ mkdir $generationdir/tmpCreaToolsBIN
  bbtkgeditorsource=bbtkGEditor
  creatoolssource=creaTools
 
+# the following stupid test is used at debug time; Please don't remove!
 if [ true = true ]
 then
 
@@ -73,13 +71,11 @@ fi
 # CREA
 #if [ true = false ]
 #then
- sh cmakemod.sh                    $creasource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                    $creasource $generationdir $VTKdir $installPrefix $buildType
  sh creaVariables.sh               $creasource $generationdir $docgeneration
  sh compilemod.sh     $buildtype   $creasource $generationdir 
  sh ctestmod.sh                    $creasource $generationdir
 #fi
-
-
     
  creadll=$generationdir/tmpCreaTools_INSTALL/creaBin
  LD_LIBRARY_PATH=$creadll:LD_LIBRARY_$PATH
@@ -90,7 +86,7 @@ fi
 #if [ true = false ]
 #then
 # BBTK
- sh cmakemod.sh              $bbtksource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh              $bbtksource $generationdir $VTKdir $installPrefix $buildType
 # echo "============================BBTK out of cmakemod "
  
  sh bbtkVariables.sh         $bbtksource $generationdir $docgeneration
@@ -105,12 +101,11 @@ fi
  bbtkdll=$generationdir/tmpCreaTools_INSTALL/bbtkBin
  LD_LIBRARY_PATH=$bbtkdll:$LD_LIBRARY_PATH
 
- 
 #if [ true = false ]
 #then
  creaMaracasVisu
 # echo "========================================================================================start creaMaracasVisu " 
- sh cmakemod.sh                        $creamaracassource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                        $creamaracassource $generationdir $VTKdir $installPrefix $buildType
 # echo "=======================================================================================creaMaracasVisu out of cmakemod "
  
  sh creaMaracasVariables.sh            $creamaracassource $generationdir $docgeneration
@@ -124,7 +119,7 @@ fi
 #if [ true = false ]
 #then
 # creaEnvironment
- sh cmakemod.sh                 $creaenvironmentsource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                 $creaenvironmentsource $generationdir $VTKdir $installPrefix $buildType
 
  sh creaenvironmentVariables.sh $creaenvironmentsource $generationdir $docgeneration
  sh compilemod.sh $buildtype    $creaenvironmentsource $generationdir
@@ -136,7 +131,7 @@ fi
 #if [ true = false ]
 #then
 # creaBruker
- sh cmakemod.sh                 $creabrukersource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                 $creabrukersource $generationdir $VTKdir $installPrefix $buildType
  sh creaBrukerVariables.sh $creabrukersource $generationdir $docgeneration
 #fi
 
@@ -148,7 +143,7 @@ fi
  LD_LIBRARY_PATH=$creabrukerdll:$LD_LIBRARY_PATH
 
 # creaImageIO
- sh cmakemod.sh              $creaimagesource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh              $creaimagesource $generationdir $VTKdir $installPrefix $buildType
  sh creaImageIOVariables.sh  $creaimagesource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creaimagesource $generationdir
  sh ctestmod.sh              $creaimagesource $generationdir
@@ -156,7 +151,7 @@ fi
  LD_LIBRARY_PATH=$creaimagedll:$LD_LIBRARY_PATH
 
 # creaContours
- sh cmakemod.sh              $creacontourssource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh              $creacontourssource $generationdir $VTKdir $installPrefix $buildType
  sh creaContoursVariables.sh $creacontourssource $generationdir $docgeneration
  sh compilemod.sh $buildtype $creacontourssource $generationdir
  sh ctestmod.sh              $creacontourssource $generationdir
@@ -164,7 +159,7 @@ fi
 # LD_LIBRARY_PATH=$creacontoursdll:$LD_LIBRARY_PATH
 
 # creaRigidRegistration
- sh cmakemod.sh                       $crearigidregistrationssource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                       $crearigidregistrationssource $generationdir $VTKdir $installPrefix $buildType
  sh creaRigidRegistrationVariables.sh $crearigidregistrationssource $generationdir $docgeneration
  sh compilemod.sh $buildtype          $crearigidregistrationssource $generationdir
  sh ctestmod.sh                       $crearigidregistrationssource $generationdir
@@ -172,7 +167,7 @@ fi
 # LD_LIBRARY_PATH=$crearigidregistrationdll:$LD_LIBRARY_PATH
 
 # bbtkGEditor
- sh cmakemod.sh              $bbtkgeditorsource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh              $bbtkgeditorsource $generationdir $VTKdir $installPrefix $buildType
  sh bbtkGEditorVariables.sh  $bbtkgeditorsource $generationdir $docgeneration
  sh compilemod.sh $buildtype $bbtkgeditorsource $generationdir
  sh ctestmod.sh              $bbtkgeditorsource $generationdir
@@ -180,7 +175,7 @@ fi
 # LD_LIBRARY_PATH=$bbtkgeditordll:$LD_LIBRARY_PATH
 
 # creaTools
- sh cmakemod.sh                    $creatoolssource $generationdir $VTKdir $installPrefix
+ sh cmakemod.sh                    $creatoolssource $generationdir $VTKdir $installPrefix $buildType
  sh creaToolsVariables.sh          $creatoolssource $generationdir $docgeneration
  sh compilemod.sh $buildtype       $creatoolssource $generationdir
 # sh ctestmod.sh $creatoolsbinary $generationdir

diff --git a/ctest/dashboard/cmakemod.sh b/ctest/dashboard/cmakemod.sh
index f2794ab78240ef2603dc3352bdb86a20d1591a21..4a401cde76a2cb6e7ba5bb158f92dbdc57fb879d 100644 (file)
--- a/ctest/dashboard/cmakemod.sh
+++ b/ctest/dashboard/cmakemod.sh
@@ -5,7 +5,14 @@ VTKdir=$3
 installPrefix=$4
 dirInstall=$currentdir/tmpCreaTools_INSTALL/$1Bin
 installPrefix=$4
+buildType=$5
 
+if [ buildType = "Debug" ]
+then
+debug = "ON"
+else
+debug = "OFF"
+fi
 
 echo dirInstall
 echo $dirInstall
@@ -17,8 +24,7 @@ echo -B$dirInstall/
 
 ## cmake -G"CodeBlocks - Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
 cmake -G"Unix Makefiles" -H$currentdir/$1 -B$dirInstall/
-
-cmake -D BUILD_ALL:BOOL=ON CMakeCache.txt
+cmake -D BUILD_ALL:BOOL=ON -D USE_DEBUG_LIB:BOOL=$debug CMakeCache.txt
 
 # the following line is the right one!
 #cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=$dirInstall -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin CMakeCache.txt
@@ -26,5 +32,5 @@ cmake -D BUILD_ALL:BOOL=ON CMakeCache.txt
 # This one : only for misinstalled vtk:
 # modify VTK_DIR:PATH=, acording to your own computer
 
-cmake -D INCLUDE_CTEST:BOOL=ON -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=/usr/lib64/vtk-5.4/ -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt
+cmake -D INCLUDE_CTEST:BOOL=ON -D BBTK_USE_WXWIDGETS:BOOL=ON -D VTK_DIR:PATH=$VTKdir -D crea_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/creaBin -D BBTK_DIR:PATH=$currentdir/tmpCreaTools_INSTALL/bbtkBin -D CMAKE_INSTALL_PREFIX:PATH=$installPrefix CMakeCache.txt
 cd ..