From: Eduardo Davila Date: Sun, 5 Sep 2010 13:11:41 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~60 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ebcf68325588db40cbc97b0d4f23c7d409cb3824;p=creaToolsTools.git *** empty log message *** --- diff --git a/ctest/dashboard/All.bat b/ctest/dashboard/All.bat index 602c8ef..e6dcfde 100644 --- a/ctest/dashboard/All.bat +++ b/ctest/dashboard/All.bat @@ -30,10 +30,10 @@ rem call cvscheckout.bat %creamaracassourcefolder% rem call cvscheckout.bat %creaenvironmentsource% rem call cvscheckout.bat %creabrukersource% rem call cvscheckout.bat %creaimagesourcefolder% -rem call cvscheckout.bat %creacontourssource% -rem call cvscheckout.bat %crearigidregistrationssource% -rem call cvscheckout.bat %bbtkgeditorsource% -rem call cvscheckout.bat %creatoolssource% +call cvscheckout.bat %creacontourssource% +call cvscheckout.bat %crearigidregistrationssource% +call cvscheckout.bat %bbtkgeditorsource% +call cvscheckout.bat %creatoolssource% rem CREA @@ -81,36 +81,35 @@ set creabrukerdll=%~dp0%creabrukersource%\%buildtype% set PATH=%creabrukerdll%;%PATH% rem creaImageIO -call cmakemod.bat %creaimagesourcefolder% -call creaImageIOVariables.bat %creaimagesourcefolder% %docgeneration% -call compilemod.bat %buildtype% %creaimagesourcefolder% -call ctestmod.bat %creaimagesourcefolder% +rem call cmakemod.bat %creaimagesourcefolder% +rem call creaImageIOVariables.bat %creaimagesourcefolder% %docgeneration% +rem call compilemod.bat %buildtype% %creaimagesourcefolder% +rem call ctestmod.bat %creaimagesourcefolder% set creaimagedll=%~dp0%creaimagesourcefolder%\%buildtype% set PATH=%creaimagedll%;%PATH% -pause rem creaContours -rem call cmakemod.bat %creacontourssource% -rem call creaContoursVariables.bat %creacontourssource% %docgeneration% -rem call compilemod.bat %buildtype% %creacontourssource% -rem call ctestmod.bat %creacontourssource% -rem set creacontourdll=%~dp0%creacontourssource%\%buildtype% +call cmakemod.bat %creacontourssource% +call creaContoursVariables.bat %creacontourssource% %docgeneration% +call compilemod.bat %buildtype% %creacontourssource% +call ctestmod.bat %creacontourssource% +set creacontourdll=%~dp0%creacontourssource%\%buildtype% rem set PATH=%creacontoursdll%;%PATH% rem creaRigidRegistration -rem call cmakemod.bat %crearigidregistrationssource% -rem call creaRigidRegistrationVariables.bat %crearigidregistrationssource% %docgeneration% -rem call compilemod.bat %buildtype% %crearigidregistrationssource% -rem call ctestmod.bat %crearigidregistrationssource% +call cmakemod.bat %crearigidregistrationssource% +call creaRigidRegistrationVariables.bat %crearigidregistrationssource% %docgeneration% +call compilemod.bat %buildtype% %crearigidregistrationssource% +call ctestmod.bat %crearigidregistrationssource% rem set crearigidregistrationdll=%~dp0%crearigidregistrationssource%\%buildtype% rem set PATH=%crearigidregistrationdll%;%PATH% rem bbtkGEditor -rem call cmakemod.bat %bbtkgeditorsource% -rem call bbtkGEditorVariables.bat %bbtkgeditorsource% %docgeneration% -rem call compilemod.bat %buildtype% %bbtkgeditorsource% -rem call ctestmod.bat %bbtkgeditorsource% +call cmakemod.bat %bbtkgeditorsource% +call bbtkGEditorVariables.bat %bbtkgeditorsource% %docgeneration% +call compilemod.bat %buildtype% %bbtkgeditorsource% +call ctestmod.bat %bbtkgeditorsource% rem set bbtkgeditordll=%~dp0%bbtkgeditorsource%\%buildtype% rem set PATH=%bbtkgeditordll%;%PATH% diff --git a/ctest/dashboard/bbtkGEditorVariables.bat b/ctest/dashboard/bbtkGEditorVariables.bat index 630d96d..0df4f3a 100644 --- a/ctest/dashboard/bbtkGEditorVariables.bat +++ b/ctest/dashboard/bbtkGEditorVariables.bat @@ -1,11 +1,12 @@ -rem %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk +rem %1=creabrukersource% %2=docgeneration + set currentdir=%~dp0 set currentdir=%currentdir:\=/% -cd %1 -cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/%2 -D BUILD_bbtkGEditor_DOC:BOOL=OFF CMakeCache.txt -cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/%3 CMakeCache.txt -cmake -D creaMaracasVisu_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/%4 CMakeCache.txt +cd %1Bin +cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D BUILD_bbtkGEditor_DOC:BOOL=OFF CMakeCache.txt +cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bin CMakeCache.txt +cmake -D creaMaracasVisu_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaMaracasVisu CMakeCache.txt cmake CMakeCache.txt cmake CMakeCache.txt cd .. \ No newline at end of file diff --git a/ctest/dashboard/creaContoursVariables.bat b/ctest/dashboard/creaContoursVariables.bat index d399179..347dfe6 100644 --- a/ctest/dashboard/creaContoursVariables.bat +++ b/ctest/dashboard/creaContoursVariables.bat @@ -1,8 +1,11 @@ -rem %1=creacontoursbinary %2=creabinfolder% %3=creaenvironmentbinary %4=creamaracasbinary %5=creaimagebinary %6=bbtkBin +rem %1=creabrukersource% %2=docgeneration + set currentdir=%~dp0 set currentdir=%currentdir:\=/% -cd %1 -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 +cd %1Bin +cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D creaEnvironment_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaEnvironment -D creaMaracasVisu_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaMaracasVisu -D creaImageIO_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaImageIO -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=ON CMakeCache.txt +cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt +cmake -D creaContours_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaContours_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt +cmake CMakeCache.txt +cd .. diff --git a/ctest/dashboard/creaImageIOVariables.bat b/ctest/dashboard/creaImageIOVariables.bat index da67fad..347161c 100644 --- a/ctest/dashboard/creaImageIOVariables.bat +++ b/ctest/dashboard/creaImageIOVariables.bat @@ -6,7 +6,7 @@ set currentdir=%currentdir:\=/% cd %1Bin cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D BUILD_BBTK_PACKAGE_creaImageIO:BOOL=ON -D creaImageIO_DOC:BOOL=ON -D creaBruker_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/creaBruker -D USE_GDCM:BOOL=ON CMakeCache.txt cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt -cmake -D BUILD_DOXYGEN_DOC:BOOL=ON -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=ON CMakeCache.txt +cmake -D BUILD_DOXYGEN_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_creaImageIO_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt cmake CMakeCache.txt cd .. \ No newline at end of file diff --git a/ctest/dashboard/creaRigidRegistrationVariables.bat b/ctest/dashboard/creaRigidRegistrationVariables.bat index 934c08a..0cda905 100644 --- a/ctest/dashboard/creaRigidRegistrationVariables.bat +++ b/ctest/dashboard/creaRigidRegistrationVariables.bat @@ -1,8 +1,11 @@ -rem %1 is the binary folder %2 is the binary folder crea %3 is the binaryfolder bbtk +rem %1=creabrukersource% %2=docgeneration + set currentdir=%~dp0 set currentdir=%currentdir:\=/% -cd %1 -cmake -D crea_DIR:PATH=%currentdir%%2 -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON -D BUILD_creaRigidRegistration_DOC:BOOL=OFF CMakeCache.txt -cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/%3 CMakeCache.txt -cd .. \ No newline at end of file +cd %1Bin +cmake -D crea_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/crea -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON CMakeCache.txt +cmake -D BBTK_DIR:PATH=%currentdir%/tmpCreaTools_INSTALL/bbtk CMakeCache.txt +cmake -D BUILD_creaRigidRegistration_DOC:BOOL=%2 -D BUILD_BBTK_PACKAGE_PackRecalage_DOXYGEN_DOC:BOOL=%2 CMakeCache.txt +cmake CMakeCache.txt +cd ..