*** empty log message ***

diff --git a/ctest/dashboard/All.bat b/ctest/dashboard/All.bat
index 1116e26258c5a6388c86ec1eda7e9200a8dbb626..24525d93d378fe1b7e58f66b14d88d5288174c0c 100644 (file)
--- a/ctest/dashboard/All.bat
+++ b/ctest/dashboard/All.bat
@@ -1,111 +1,115 @@
 rem @echo off
 set buildtype=Release
 
-rem CREA
 set creasourcefolder=crea
 set creabinfolder=creaBin
-rem call cvscheckout.bat %creasourcefolder%
-rem call cmakemod.bat %creasourcefolder% %creabinfolder%
-rem call creaVariables.bat %creabinfolder% %creasourcefolder%
-rem call compilemod.bat %buildtype% %creabinfolder%
-rem call ctestmod.bat %creabinfolder%
+set bbtksourcefolder=bbtk
+set bbtkbinfolder=bbtkBin
+set creamaracassourcefolder=creaMaracasVisu
+set creamaracasbinary=creaMaracasVisuBin
+set creaenvironmentsource=creaEnvironment
+set creaenvironmentbinary=creaEnvironmentBin
+set creabrukersource=creaBruker
+set creabrukerbinary=creaBrukerBin
+set creaimagesourcefolder=creaImageIO
+set creaimagebinary=creaImageIOBin
+set creacontourssource=creaContours
+set creacontoursbinary=creaContoursBin
+set crearigidregistrationssource=creaRigidRegistration
+set crearigidregistrationbinary=creaRigidRegistrationBin
+set bbtkgeditorsource=bbtkGEditor
+set bbtkgeditorbinary=bbtkGEditorBin
+set creatoolssource=creaTools
+set creatoolsbinary=creaToolsBin
+
+
+call cvscheckout.bat %creasourcefolder%
+call cvscheckout.bat %bbtksourcefolder%
+call cvscheckout.bat %creamaracassourcefolder%
+call cvscheckout.bat %creaenvironmentsource%
+call cvscheckout.bat %creabrukersource%
+call cvscheckout.bat %creaimagesourcefolder%
+call cvscheckout.bat %creacontourssource%
+call cvscheckout.bat %crearigidregistrationssource%
+call cvscheckout.bat %bbtkgeditorsource%
+call cvscheckout.bat %creatoolssource%
+
+
+rem CREA
+call cmakemod.bat %creasourcefolder% %creabinfolder%
+call creaVariables.bat %creabinfolder% %creasourcefolder%
+call compilemod.bat %buildtype% %creabinfolder%
+call ctestmod.bat %creabinfolder%
 set creadll=%~dp0
 set creadll=%creadll%%creabinfolder%\%buildtype%
 set PATH=%creadll%;%PATH%
 
 rem BBTK
-set bbtksourcefolder=bbtk
-set bbtkbinfolder=bbtkBin
-rem call cvscheckout.bat %bbtksourcefolder%
-rem call cmakemod.bat %bbtksourcefolder% %bbtkbinfolder%
-rem call bbtkVariables.bat %bbtkbinfolder% %creabinfolder%
-rem call compilemod.bat %buildtype% %bbtkbinfolder%
-rem call ctestmod.bat %bbtkbinfolder%
+call cmakemod.bat %bbtksourcefolder% %bbtkbinfolder%
+call bbtkVariables.bat %bbtkbinfolder% %creabinfolder%
+call compilemod.bat %buildtype% %bbtkbinfolder%
+call ctestmod.bat %bbtkbinfolder%
 set bbtkdll=%~dp0
 set bbtkdll=%bbtkdll%%bbtkbinfolder%\%buildtype%
 set PATH=%bbtkdll%;%PATH%
 
 rem creaMaracasVisu
-set creamaracassourcefolder=creaMaracasVisu
-set creamaracasbinary=creaMaracasVisuBin
-rem call cvscheckout.bat %creamaracassourcefolder%
-rem call cmakemod.bat %creamaracassourcefolder% %creamaracasbinary%
-rem call creaMaracasVariables.bat %creamaracasbinary% %creabinfolder% %bbtkbinfolder%
-rem call compilemod.bat %buildtype% %creamaracasbinary%
-rem call ctestmod.bat %creamaracasbinary%
+call cmakemod.bat %creamaracassourcefolder% %creamaracasbinary%
+call creaMaracasVariables.bat %creamaracasbinary% %creabinfolder% %bbtkbinfolder%
+call compilemod.bat %buildtype% %creamaracasbinary%
+call ctestmod.bat %creamaracasbinary%
 set creamaracasdll=%~dp0%creamaracasbinary%\%buildtype%
 set PATH=%creamaracasdll%;%PATH%
 
 rem creaEnvironment
-set creaenvironmentsource=creaEnvironment
-set creaenvironmentbinary=creaEnvironmentBin
-rem call cvscheckout.bat %creaenvironmentsource%
-rem call cmakemod.bat %creaenvironmentsource% %creaenvironmentbinary%
-rem call creaenvironmentVariables.bat %creaenvironmentbinary% %creabinfolder%
-rem call compilemod.bat %buildtype% %creaenvironmentbinary%
-rem call ctestmod.bat %creaenvironmentbinary%
+call cmakemod.bat %creaenvironmentsource% %creaenvironmentbinary%
+call creaenvironmentVariables.bat %creaenvironmentbinary% %creabinfolder%
+call compilemod.bat %buildtype% %creaenvironmentbinary%
+call ctestmod.bat %creaenvironmentbinary%
 set creaenvironmentdll=%~dp0%creaenvironmentbinary%\%buildtype%
 set PATH=%creaenvironmentdll%;%PATH%
 
 rem creaBruker
-set creabrukersource=creaBruker
-set creabrukerbinary=creaBrukerBin
-rem call cvscheckout.bat %creabrukersource%
-rem call cmakemod.bat %creabrukersource% %creabrukerbinary%
-rem call creaenvironmentVariables.bat %creabrukerbinary% %creabinfolder%
-rem call compilemod.bat %buildtype% %creabrukerbinary%
-rem call ctestmod.bat %creabrukerbinary%
+call cmakemod.bat %creabrukersource% %creabrukerbinary%
+call creaenvironmentVariables.bat %creabrukerbinary% %creabinfolder%
+call compilemod.bat %buildtype% %creabrukerbinary%
+call ctestmod.bat %creabrukerbinary%
 set creabrukerdll=%~dp0%creabrukerbinary%\%buildtype%
 set PATH=%creabrukerdll%;%PATH%
 
 rem creaImageIO
-set creaimagesourcefolder=creaImageIO
-set creaimagebinary=creaImageIOBin
-rem call cvscheckout.bat %creaimagesourcefolder%
-rem call cmakemod.bat %creaimagesourcefolder% %creaimagebinary%
-rem call creaImageIOVariables.bat %creaimagebinary% %creabinfolder% %bbtkbinfolder% %creabrukerbinary%
-rem call compilemod.bat %buildtype% %creaimagebinary%
-rem call ctestmod.bat %creaimagebinary%
+call cmakemod.bat %creaimagesourcefolder% %creaimagebinary%
+call creaImageIOVariables.bat %creaimagebinary% %creabinfolder% %bbtkbinfolder% %creabrukerbinary%
+call compilemod.bat %buildtype% %creaimagebinary%
+call ctestmod.bat %creaimagebinary%
 set creaimagedll=%~dp0%creaimagebinary%\%buildtype%
 set PATH=%creaimagedll%;%PATH%
 
 rem creaContours
-set creacontourssource=creaContours
-set creacontoursbinary=creaContoursBin
-rem call cvscheckout.bat %creacontourssource%
-rem call cmakemod.bat %creacontourssource% %creacontoursbinary%
-rem call creaContoursVariables.bat %creacontoursbinary% %creabinfolder% %creaenvironmentbinary% %creamaracasbinary% %creaimagebinary% %bbtkbinfolder%
-rem call compilemod.bat %buildtype% %creacontoursbinary%
-rem call ctestmod.bat %creacontoursbinary%
+call cmakemod.bat %creacontourssource% %creacontoursbinary%
+call creaContoursVariables.bat %creacontoursbinary% %creasourcefolder% %creaenvironmentsource% %creamaracassourcefolder% %creaimagesourcefolder% %bbtksourcefolder%
+call compilemod.bat %buildtype% %creacontoursbinary%
+call ctestmod.bat %creacontoursbinary%
 rem set creacontourdll=%~dp0%creacontoursbinary%\%buildtype%
 rem set PATH=%creacontoursdll%;%PATH%
 
 rem creaRigidRegistration
-set crearigidregistrationssource=creaRigidRegistration
-set crearigidregistrationbinary=creaRigidRegistrationBin
-rem call cvscheckout.bat %crearigidregistrationssource%
-rem call cmakemod.bat %crearigidregistrationssource% %crearigidregistrationbinary%
-rem call creaRigidRegistrationVariables.bat %crearigidregistrationbinary% %creabinfolder% %bbtksourcefolder%
-rem call compilemod.bat %buildtype% %crearigidregistrationbinary%
-rem call ctestmod.bat %crearigidregistrationbinary%
+call cmakemod.bat %crearigidregistrationssource% %crearigidregistrationbinary%
+call creaRigidRegistrationVariables.bat %crearigidregistrationbinary% %creabinfolder% %bbtksourcefolder%
+call compilemod.bat %buildtype% %crearigidregistrationbinary%
+call ctestmod.bat %crearigidregistrationbinary%
 rem set crearigidregistrationdll=%~dp0%crearigidregistrationbinary%\%buildtype%
 rem set PATH=%crearigidregistrationdll%;%PATH%
 
 rem bbtkGEditor
-set bbtkgeditorsource=bbtkGEditor
-set bbtkgeditorbinary=bbtkGEditorBin
-rem call cvscheckout.bat %bbtkgeditorsource%
-rem call cmakemod.bat %bbtkgeditorsource% %bbtkgeditorbinary%
-rem call bbtkGEditorVariables.bat %bbtkgeditorbinary% %creasourcefolder% %bbtksourcefolder% %creamaracassourcefolder%
-rem call compilemod.bat %buildtype% %bbtkgeditorbinary%
-rem call ctestmod.bat %bbtkgeditorbinary%
+call cmakemod.bat %bbtkgeditorsource% %bbtkgeditorbinary%
+call bbtkGEditorVariables.bat %bbtkgeditorbinary% %creasourcefolder% %bbtksourcefolder% %creamaracassourcefolder%
+call compilemod.bat %buildtype% %bbtkgeditorbinary%
+call ctestmod.bat %bbtkgeditorbinary%
 rem set bbtkgeditordll=%~dp0%bbtkgeditorbinary%\%buildtype%
 rem set PATH=%bbtkgeditordll%;%PATH%
 
 rem creaTools
-set creatoolssource=creaTools
-set creatoolsbinary=creaToolsBin
-call cvscheckout.bat %creatoolssource%
 call cmakemod.bat %creatoolssource% %creatoolsbinary%
 call creaToolsVariables.bat %creatoolsbinary%
 call compilemodCreaTools.bat %buildtype% %creatoolsbinary%
@@ -113,7 +117,5 @@ rem remcall ctestmod.bat %creatoolsbinary%
 set creatoolsdll=%~dp0%creatoolsbinary%\%buildtype%
 set PATH=%creatoolssdll%;%PATH%
 
-pause
-
 rem shutdown /s
 exit /b
\ No newline at end of file

diff --git a/ctest/dashboard/creaContoursVariables.bat b/ctest/dashboard/creaContoursVariables.bat
index daf8de1873098442ed0da6a5afac9d44ef8636ef..d399179a7220d294ec26f5b2786c1a1079d7f519 100644 (file)
--- a/ctest/dashboard/creaContoursVariables.bat
+++ b/ctest/dashboard/creaContoursVariables.bat
@@ -3,6 +3,6 @@ set currentdir=%~dp0
 set currentdir=%currentdir:\=/%
 
 cd %1
-cmake -D crea_DIR:PATH=%currentdir%%2 -D creaEnvironment_DIR:PATH=%currentdir%%3 -D creaMaracasVisu_DIR:PATH=%currentdir%%4 -D creaImageIO_DIR:PATH=%currentdir%%5 -D BUILD_BBTK_PACKAGE_creaContours:BOOL=ON CMakeCache.txt
-cmake -D BBTK_DIR:PATH=%currentdir%%6 CMakeCache.txt
+cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/%2 -D creaEnvironment_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/%3 -D creaMaracasVisu_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/%4 -D creaImageIO_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/%5 -D BUILD_BBTK_PACKAGE_creaContours:BOOL=ON CMakeCache.txt
+cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/%6 CMakeCache.txt
 cd ..
\ No newline at end of file