*** empty log message ***

diff --git a/ctest/dashboard/All.bat b/ctest/dashboard/All.bat
index 17fd8f6552f969811818b55f7869645acda4cd3d..3ba322359c4f230a9024498d9dee97ff03d49c2e 100644 (file)
--- a/ctest/dashboard/All.bat
+++ b/ctest/dashboard/All.bat
@@ -36,7 +36,7 @@ call cvscheckout.bat %creatoolssource% %cvsUser%
 
 rem CREA
 call cleanmod.bat %creasourcefolder%
-call cmakemod.bat %creasourcefolder% 
+call cmakemod.bat %creasourcefolder% %dirInstall%
 call creaVariables.bat %creasourcefolder% 
 call compilemod.bat %buildtype% %creasourcefolder%
 call ctestmod.bat %creasourcefolder%
@@ -47,7 +47,7 @@ set PATH=%creadll%;%PATH%
 
 rem BBTK
 call cleanmod.bat %bbtksourcefolder%
-call cmakemod.bat %bbtksourcefolder% 
+call cmakemod.bat %bbtksourcefolder%  %dirInstall%
 call bbtkVariables.bat %bbtksourcefolder% %docgeneration%
 call compilemod.bat %buildtype% %bbtksourcefolder%
 call ctestmod.bat %bbtksourcefolder%
@@ -57,7 +57,7 @@ set PATH=%bbtkdll%;%PATH%
 
 rem creaMaracasVisu
 call cleanmod.bat %creamaracassourcefolder%
-call cmakemod.bat %creamaracassourcefolder% 
+call cmakemod.bat %creamaracassourcefolder%  %dirInstall%
 call creaMaracasVariables.bat %creamaracassourcefolder% %docgeneration%
 call compilemod.bat %buildtype% %creamaracassourcefolder%
 call ctestmod.bat %creamaracassourcefolder%
@@ -67,7 +67,7 @@ set PATH=%creamaracasdll%;%PATH%
 
 rem creaEnvironment
 call cleanmod.bat %creaenvironmentsource%
-call cmakemod.bat %creaenvironmentsource% 
+call cmakemod.bat %creaenvironmentsource%  %dirInstall%
 call creaenvironmentVariables.bat %creaenvironmentsource% 
 call compilemod.bat %buildtype% %creaenvironmentsource%
 call ctestmod.bat %creaenvironmentsource%
@@ -76,7 +76,7 @@ set PATH=%creaenvironmentdll%;%PATH%
 
 rem creaBruker
 call cleanmod.bat %creabrukersource%
-call cmakemod.bat %creabrukersource% 
+call cmakemod.bat %creabrukersource%  %dirInstall%
 call creaBrukerVariables.bat %creabrukersource% %docgeneration%
 call compilemod.bat %buildtype% %creabrukersource%
 call ctestmod.bat %creabrukersource%
@@ -85,7 +85,7 @@ set PATH=%creabrukerdll%;%PATH%
 
 rem creaImageIO
 call cleanmod.bat %creaimagesourcefolder%
-call cmakemod.bat %creaimagesourcefolder% 
+call cmakemod.bat %creaimagesourcefolder%  %dirInstall%
 call creaImageIOVariables.bat %creaimagesourcefolder% %docgeneration% 
 call compilemod.bat %buildtype% %creaimagesourcefolder%
 call ctestmod.bat %creaimagesourcefolder%
@@ -95,7 +95,7 @@ set PATH=%creaimagedll%;%PATH%
 
 rem creaContours
 call cleanmod.bat %creacontourssource%
-call cmakemod.bat %creacontourssource% 
+call cmakemod.bat %creacontourssource%  %dirInstall%
 call creaContoursVariables.bat %creacontourssource% %docgeneration%
 call compilemod.bat %buildtype% %creacontourssource%
 call ctestmod.bat %creacontourssource%
@@ -104,7 +104,7 @@ rem set PATH=%creacontoursdll%;%PATH%
 
 rem creaRigidRegistration
 call cleanmod.bat %crearigidregistrationssource%
-call cmakemod.bat %crearigidregistrationssource% 
+call cmakemod.bat %crearigidregistrationssource%  %dirInstall%
 call creaRigidRegistrationVariables.bat %crearigidregistrationssource% %docgeneration% 
 call compilemod.bat %buildtype% %crearigidregistrationssource%
 call ctestmod.bat %crearigidregistrationssource%
@@ -113,7 +113,7 @@ rem set PATH=%crearigidregistrationdll%;%PATH%
 
 rem bbtkGEditor
 call cleanmod.bat %bbtkgeditorsource%
-call cmakemod.bat %bbtkgeditorsource% 
+call cmakemod.bat %bbtkgeditorsource%  %dirInstall%
 call bbtkGEditorVariables.bat %bbtkgeditorsource% %docgeneration% 
 call compilemod.bat %buildtype% %bbtkgeditorsource%
 call ctestmod.bat %bbtkgeditorsource%
@@ -122,18 +122,13 @@ rem set PATH=%bbtkgeditordll%;%PATH%
 
 rem creaTools
 call cleanmod.bat %creatoolssource%
-pause
-call cmakemod.bat %creatoolssource% 
-pause
+call cmakemod.bat %creatoolssource%  %dirInstall%
 call creaToolsVariables.bat %creatoolssource%
-pause
 call compilemodCreaTools.bat %buildtype% %creatoolssource%
-pause
 rem remcall ctestmod.bat %creatoolssource%
 set creatoolsdll=%~dp0%creatoolssource%\%buildtype%
 set PATH=%creatoolssdll%;%PATH%
 
-pause
 
 rem shutdown /s
 exit /b
\ No newline at end of file

diff --git a/ctest/dashboard/cmakemod.bat b/ctest/dashboard/cmakemod.bat
index d8e9e4b33cca091fd87f37333178f631a297740a..d1f8f457eec7f7fd6c6fa682e661b19f9cabffa6 100644 (file)
--- a/ctest/dashboard/cmakemod.bat
+++ b/ctest/dashboard/cmakemod.bat
@@ -1,12 +1,13 @@
 REM %1=<Module Sources  Ex. crea bbbtk creaMaracasVisu...>
+REM %2=<dirInstall>
 
 set currentdir=%~dp0
 set currentdir=%currentdir:\=/%
-set dirInstall=%currentdir%/tmpCreaTools_INSTALL/%1%
+set dirInstallModule=%2\%1
 
 mkdir %1Bin
 cd %1Bin
 cmake -G"Visual Studio 9 2008" -H%currentdir%%1 -B%currentdir%%1Bin
-cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%dirInstall% CMakeCache.txt
+cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%dirInstallModule% CMakeCache.txt
 cd ..
 

diff --git a/ctest/dashboard/creaToolsVariables.bat b/ctest/dashboard/creaToolsVariables.bat
index 685cd70d0944bbe28df49c3109cd43571f0f5098..a16d5a6cc4e79b0a3efa2ec9a75d8c29955b17f8 100644 (file)
--- a/ctest/dashboard/creaToolsVariables.bat
+++ b/ctest/dashboard/creaToolsVariables.bat
@@ -1,6 +1,5 @@
-set currentdir=%~dp0
-set currentdir=%currentdir:\=/%
+REM %1=<dirInstall>
 
 cd %1Bin
-cmake -D CREATOOLS_SOURCE_PATH:PATH=%currentdir%/tmpCreaTools_INSTALL/ CMakeCache.txt
+cmake -D CREATOOLS_SOURCE_PATH:PATH=%1 CMakeCache.txt
 cd ..
\ No newline at end of file