*** empty log message ***

diff --git a/Install/scripts/All.bat b/Install/scripts/All.bat
index 02e011af7f8c50a79ba396ec7de3b79bbc7e29a9..1bc2c0dda3ba5956eee163317d94fb6e7150294c 100644 (file)
--- a/Install/scripts/All.bat
+++ b/Install/scripts/All.bat
@@ -39,7 +39,6 @@ call %currentdir%\cvscheckout.bat %bbtkgeditorsource% %cvsUser% %creatoolsGenera
 call %currentdir%\cvscheckout.bat %creatoolssource% %cvsUser% %creatoolsGeneration%
 
 
-
 rem CREA
 call %currentdir%\cleanmod.bat %creasource% %creatoolsGeneration%
 call %currentdir%\cmakemod.bat %creasource% %installPrefix% %creatoolsGeneration%
@@ -49,7 +48,6 @@ call %currentdir%\ctestmod.bat %creasource% %creatoolsGeneration%
 set creadll=%creatoolsGeneration%\creatools_bin\%creasource%Bin\%buildtype%
 set PATH=%creadll%;%PATH%
 
-
 rem BBTK
 call %currentdir%\cleanmod.bat %bbtksource% %creatoolsGeneration%
 call %currentdir%\cmakemod.bat %bbtksource%  %installPrefix% %creatoolsGeneration%
@@ -59,7 +57,6 @@ call %currentdir%\ctestmod.bat %bbtksource% %creatoolsGeneration%
 set bbtkdll=%creatoolsGeneration%\creatools_bin\%bbtksource%Bin\%buildtype%
 set PATH=%bbtkdll%;%PATH%
 
-
 rem creaMaracasVisu
 call %currentdir%\cleanmod.bat %creamaracassource% %creatoolsGeneration%
 call %currentdir%\cmakemod.bat %creamaracassource%  %installPrefix% %creatoolsGeneration%
@@ -69,7 +66,6 @@ call %currentdir%\ctestmod.bat %creamaracassource% %creatoolsGeneration%
 set creamaracasdll=%creatoolsGeneration%\creatools_bin\%creamaracassource%Bin\%buildtype%
 set PATH=%creamaracasdll%;%PATH%
 
-
 rem creaEnvironment
 call %currentdir%\cleanmod.bat %creaenvironmentsource% %creatoolsGeneration%
 call %currentdir%\cmakemod.bat %creaenvironmentsource%  %installPrefix% %creatoolsGeneration%
@@ -97,7 +93,6 @@ call %currentdir%\ctestmod.bat %creaimagesource% %creatoolsGeneration%
 set creaimagedll=%creatoolsGeneration%\creatools_bin\%creaimagesource%Bin\%buildtype%
 set PATH=%creaimagedll%;%PATH%
 
-
 rem creaContours
 call %currentdir%\cleanmod.bat %creacontourssource% %creatoolsGeneration%
 call %currentdir%\cmakemod.bat %creacontourssource%  %installPrefix% %creatoolsGeneration%
@@ -134,6 +129,5 @@ rem remcall ctestmod.bat %creatoolssource% %creatoolsGeneration%
 set creatoolsdll=%creatoolsGeneration%\creatools_bin\%creatoolssource%Bin\%buildtype%
 rem set PATH=%creatoolssdll%;%PATH%
 
-pause
 rem shutdown /s
 exit /b
\ No newline at end of file

diff --git a/Install/scripts/cleanmod.bat b/Install/scripts/cleanmod.bat
index 24e57573b530c1d02452eee80b661787f18438dc..61e79f4a20c6a530e27a9dda883e7c83b044e03a 100644 (file)
--- a/Install/scripts/cleanmod.bat
+++ b/Install/scripts/cleanmod.bat
@@ -5,6 +5,7 @@ REM %2 = <creatoolsGeneration>
 set binfolder=%2\creatools_bin\%1Bin
 mkdir %binfolder%
 cd %binfolder%
+del CMakeCache.txt
 del *.exe
 del *.dll
 del Debug\*.exe

diff --git a/Install/scripts/cmakemod.bat b/Install/scripts/cmakemod.bat
index ee6bd4cd02fd0c2ff38078dc1c1bf8b81b53600c..5848a4e97a28bb11d462945ad3b6930fb3680830 100644 (file)
--- a/Install/scripts/cmakemod.bat
+++ b/Install/scripts/cmakemod.bat
@@ -2,10 +2,9 @@ REM %1 = <Module Sources  Ex. crea bbbtk creaMaracasVisu...>
 REM %2 = <installPrefix>
 REM %3 = <creatoolsGeneration>
 
+set binfolder=%3\creatools_bin\%1Bin
+cd %binfolder%
 
-mkdir %1Bin
-cd %1Bin
 cmake -G"Visual Studio 9 2008" -H%3\creatools_sources\%1 -B%3\creatools_bin\%1Bin
 cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt
 
-

diff --git a/Install/scripts/creaImageIOVariables.bat b/Install/scripts/creaImageIOVariables.bat
index 13873b96f63f84047fabd414bfa287793686eaa4..a1d9b3f68d362e68a41e8c6a918dafd14f3b4622 100644 (file)
--- a/Install/scripts/creaImageIOVariables.bat
+++ b/Install/scripts/creaImageIOVariables.bat
@@ -5,7 +5,7 @@ REM %3 = <docgeneration>
 set binfolder=%1\creatools_bin\%2Bin
 cd %binfolder%
 
-cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt
+cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaBruker_DIR:PATH=%1\creatools_install\creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt
 cmake -D BBTK_DIR:PATH=%1\creatools_install/bbtk CMakeCache.txt
 cmake -D BUILD_DOXYGEN_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt
 cmake CMakeCache.txt