From 202b0b1a7dc0552a8c4a9eb1c9c48b6866af6404 Mon Sep 17 00:00:00 2001 From: Diego Caceres Date: Tue, 24 Jul 2012 13:34:27 +0000 Subject: [PATCH] DFCH: creaTools windows x64 Release/Debug script Feature #1530 Feature #1531 --- Install/scripts/bbtk/bbtkInstall.bat | 2 +- Install/scripts/bbtk/bbtkVariables.bat | 9 +++++++++ Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat | 2 +- Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat | 9 +++++++++ Install/scripts/crea/creaInstall.bat | 2 +- Install/scripts/crea/creaVariables.bat | 11 ++++++++--- Install/scripts/creaBruker/creaBrukerInstall.bat | 2 +- Install/scripts/creaBruker/creaBrukerVariables.bat | 5 +++++ Install/scripts/creaContours/creaContoursInstall.bat | 2 +- .../scripts/creaContours/creaContoursVariables.bat | 5 +++++ .../creaEnvironment/creaEnvironmentInstall.bat | 2 +- .../creaEnvironment/creaenvironmentVariables.bat | 5 +++++ Install/scripts/creaImageIO/creaImageIOInstall.bat | 2 +- Install/scripts/creaImageIO/creaImageIOVariables.bat | 5 +++++ .../scripts/creaMaracasVisu/creaMaracasVariables.bat | 6 ++++++ .../creaMaracasVisu/creaMaracasVisuInstall.bat | 2 +- .../creaRigidRegistration/creaRigidRInstall.bat | 2 +- .../creaRigidRegistrationVariables.bat | 5 +++++ Install/scripts/creaTools/creaMiniToolsVariables.bat | 9 +++++++++ Install/scripts/creaTools/creaMinitoolsInstall.bat | 2 +- Install/scripts/creaTools/creaToolsInstall.bat | 2 +- Install/scripts/creaTools/creaToolsVariables.bat | 5 +++++ 22 files changed, 82 insertions(+), 14 deletions(-) diff --git a/Install/scripts/bbtk/bbtkInstall.bat b/Install/scripts/bbtk/bbtkInstall.bat index 29010e6..1e4438b 100644 --- a/Install/scripts/bbtk/bbtkInstall.bat +++ b/Install/scripts/bbtk/bbtkInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo compile bbtk call %baseFolder%\cleanmod.bat %bbtksource% %creatoolsGeneration% >> %logFolder%\bbtkInstall.log 2>&1 call %baseFolder%\cmakemod.bat %bbtksource% %installPrefix% %creatoolsGeneration% >> %logFolder%\bbtkInstall.log 2>&1 -call %currentdir%\bbtkVariables.bat %creatoolsGeneration% %bbtksource% %docgeneration% >> %logFolder%\bbtkInstall.log 2>&1 +call %currentdir%\bbtkVariables.bat %creatoolsGeneration% %bbtksource% %docgeneration% %buildtype% >> %logFolder%\bbtkInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %bbtksource% %creatoolsGeneration% >> %logFolder%\bbtkInstall.log 2>&1 call %baseFolder%\ctestmod.bat %bbtksource% %creatoolsGeneration% >> %logFolder%\bbtkInstall.log 2>&1 echo end bbtk compilation diff --git a/Install/scripts/bbtk/bbtkVariables.bat b/Install/scripts/bbtk/bbtkVariables.bat index c6d88f7..90a5d30 100644 --- a/Install/scripts/bbtk/bbtkVariables.bat +++ b/Install/scripts/bbtk/bbtkVariables.bat @@ -1,11 +1,20 @@ @echo off +echo ---------------------------- +echo -----bbtkVariables.bat------ +echo ---------------------------- + echo %1 = creatoolsGeneration echo %2 = bbtksourcefolder echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + cmake -D --BUILD_ALL:BOOL=ON -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt cmake -D BUILD_BBTK_DOC:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_HTML:BOOL=%3 -D BUILD_BBTK_DOC_GUIDES_PDF:BOOL=%3 -D BUILD_BBTK_DOC_DOXYGEN:BOOL=%3 -D BUILD_BBTK_DOC_PACKAGE:BOOL=%3 CMakeCache.txt diff --git a/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat b/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat index d1ad674..a2cb234 100644 --- a/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat +++ b/Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo compile bbtkGEditor call %baseFolder%\cleanmod.bat %bbtkgeditorsource% %creatoolsGeneration% >> %logFolder%\bbtkGEditorInstall.log 2>&1 call %baseFolder%\cmakemod.bat %bbtkgeditorsource% %installPrefix% %creatoolsGeneration% >> %logFolder%\bbtkGEditorInstall.log 2>&1 -call %currentdir%\bbtkGEditorVariables.bat %creatoolsGeneration% %bbtkgeditorsource% %docgeneration% >> %logFolder%\bbtkGEditorInstall.log 2>&1 +call %currentdir%\bbtkGEditorVariables.bat %creatoolsGeneration% %bbtkgeditorsource% %docgeneration% %buildtype% >> %logFolder%\bbtkGEditorInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %bbtkgeditorsource% %creatoolsGeneration% >> %logFolder%\bbtkGEditorInstall.log 2>&1 call %baseFolder%\ctestmod.bat %bbtkgeditorsource% %creatoolsGeneration% >> %logFolder%\bbtkGEditorInstall.log 2>&1 echo end of bbtkGEditor compilation diff --git a/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat b/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat index 76be772..5dc762b 100644 --- a/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat +++ b/Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat @@ -1,11 +1,20 @@ @echo off +echo ---------------------------- +echo --bbtkGEditorVariables.bat-- +echo ---------------------------- + echo %1 = creatoolsGeneration echo %2 = bbtkgeditorsource echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + cmake -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt cmake -D creaMaracasVisu_DIR:PATH=%1\creatools_install\creaMaracasVisu CMakeCache.txt diff --git a/Install/scripts/crea/creaInstall.bat b/Install/scripts/crea/creaInstall.bat index 8ec14e7..839b4ba 100644 --- a/Install/scripts/crea/creaInstall.bat +++ b/Install/scripts/crea/creaInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo Compile crea call %baseFolder%\cleanmod.bat %creasource% %creatoolsGeneration% >> %logFolder%\creaInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creasource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaInstall.log 2>&1 -call %currentdir%\creaVariables.bat %creatoolsGeneration% %creasource% %docgeneration% >> %logFolder%\creaInstall.log 2>&1 +call %currentdir%\creaVariables.bat %creatoolsGeneration% %creasource% %docgeneration% %buildType% >> %logFolder%\creaInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %creasource% %creatoolsGeneration% >> %logFolder%\creaInstall.log 2>&1 call %baseFolder%\ctestmod.bat %creasource% %creatoolsGeneration% >> %logFolder%\creaInstall.log 2>&1 diff --git a/Install/scripts/crea/creaVariables.bat b/Install/scripts/crea/creaVariables.bat index 1bce3a9..0ba113c 100644 --- a/Install/scripts/crea/creaVariables.bat +++ b/Install/scripts/crea/creaVariables.bat @@ -1,18 +1,23 @@ @echo off echo ---------------------------- -echo ----creaVariables.bat------- +echo -----creaVariables.bat------ echo ---------------------------- echo %1 = creatoolsGeneration echo %2 = creasource echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% -if %PROCESSOR_ARCHITECTURE%==x86 ( +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + +IF %PROCESSOR_ARCHITECTURE%==x86 ( cmake -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CMakeCache.txt -) else ( +) ELSE ( cmake -D CREA_BUILD_VTK:BOOL=ON -D CREA_BUILD_WX:BOOL=ON CREA_BUILD_WX_X64:BOOL=ON CMakeCache.txt ) diff --git a/Install/scripts/creaBruker/creaBrukerInstall.bat b/Install/scripts/creaBruker/creaBrukerInstall.bat index 8c354bb..07d9cb9 100644 --- a/Install/scripts/creaBruker/creaBrukerInstall.bat +++ b/Install/scripts/creaBruker/creaBrukerInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo compile creaBruker call %baseFolder%\cleanmod.bat %creabrukersource% %creatoolsGeneration% >> %logFolder%\creaBrukerInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creabrukersource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaBrukerInstall.log 2>&1 -call %currentdir%\creaBrukerVariables.bat %creatoolsGeneration% %creabrukersource% %docgeneration% >> %logFolder%\creaBrukerInstall.log 2>&1 +call %currentdir%\creaBrukerVariables.bat %creatoolsGeneration% %creabrukersource% %docgeneration% %buildtype% >> %logFolder%\creaBrukerInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %creabrukersource% %creatoolsGeneration% >> %logFolder%\creaBrukerInstall.log 2>&1 call %baseFolder%\ctestmod.bat %creabrukersource% %creatoolsGeneration% >> %logFolder%\creaBrukerInstall.log 2>&1 diff --git a/Install/scripts/creaBruker/creaBrukerVariables.bat b/Install/scripts/creaBruker/creaBrukerVariables.bat index 5d149fc..634bc92 100644 --- a/Install/scripts/creaBruker/creaBrukerVariables.bat +++ b/Install/scripts/creaBruker/creaBrukerVariables.bat @@ -6,10 +6,15 @@ echo ---------------------------- echo %1 = creatoolsGeneration echo %2 = creabrukersource echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + cmake -D --BUILD_ALL:BOOL=OFF -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_creaBruker_DOC:BOOL=%3 CMakeCache.txt exit /B \ No newline at end of file diff --git a/Install/scripts/creaContours/creaContoursInstall.bat b/Install/scripts/creaContours/creaContoursInstall.bat index 398c965..3b39c7e 100644 --- a/Install/scripts/creaContours/creaContoursInstall.bat +++ b/Install/scripts/creaContours/creaContoursInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo compile creaContours call %baseFolder%\cleanmod.bat %creacontourssource% %creatoolsGeneration% >> %logFolder%\creaContoursInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creacontourssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaContoursInstall.log 2>&1 -call %currentdir%\creaContoursVariables.bat %creatoolsGeneration% %creacontourssource% %docgeneration% >> %logFolder%\creaContoursInstall.log 2>&1 +call %currentdir%\creaContoursVariables.bat %creatoolsGeneration% %creacontourssource% %docgeneration% %buildtype% >> %logFolder%\creaContoursInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %creacontourssource% %creatoolsGeneration% >> %logFolder%\creaContoursInstall.log 2>&1 call %baseFolder%\ctestmod.bat %creacontourssource% %creatoolsGeneration% >> %logFolder%\creaContoursInstall.log 2>&1 echo end of creaContours compilation diff --git a/Install/scripts/creaContours/creaContoursVariables.bat b/Install/scripts/creaContours/creaContoursVariables.bat index fc2b60e..59bcc74 100644 --- a/Install/scripts/creaContours/creaContoursVariables.bat +++ b/Install/scripts/creaContours/creaContoursVariables.bat @@ -6,10 +6,15 @@ echo ---------------------------- echo %1 = creatoolsGeneration echo %2 = creacontourssource echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + echo %1=creabrukersource% %2=docgeneration cmake -D crea_DIR:PATH=%1\creatools_install\crea -D creaEnvironment_DIR:PATH=%1\creatools_install\creaEnvironment -D creaMaracasVisu_DIR:PATH=%1\creatools_install\creaMaracasVisu -D creaImageIO_DIR:PATH=%1\creatools_install\creaImageIO CMakeCache.txt cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt diff --git a/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat b/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat index d132443..26acb83 100644 --- a/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat +++ b/Install/scripts/creaEnvironment/creaEnvironmentInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo compile creaEnvironment call %baseFolder%\cleanmod.bat %creaenvironmentsource% %creatoolsGeneration% >> %logFolder%\creaEnvironmentInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creaenvironmentsource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaEnvironmentInstall.log 2>&1 -call %currentdir%\creaenvironmentVariables.bat %creatoolsGeneration% %creaenvironmentsource% %docgeneration% >> %logFolder%\creaEnvironmentInstall.log 2>&1 +call %currentdir%\creaenvironmentVariables.bat %creatoolsGeneration% %creaenvironmentsource% %docgeneration% %buildtype% >> %logFolder%\creaEnvironmentInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %creaenvironmentsource% %creatoolsGeneration% >> %logFolder%\creaEnvironmentInstall.log 2>&1 call %baseFolder%\ctestmod.bat %creaenvironmentsource% %creatoolsGeneration% >> %logFolder%\creaEnvironmentInstall.log 2>&1 echo end of creaEnvironment compilation diff --git a/Install/scripts/creaEnvironment/creaenvironmentVariables.bat b/Install/scripts/creaEnvironment/creaenvironmentVariables.bat index e2fc3ee..f5b86f6 100644 --- a/Install/scripts/creaEnvironment/creaenvironmentVariables.bat +++ b/Install/scripts/creaEnvironment/creaenvironmentVariables.bat @@ -6,10 +6,15 @@ echo ---------------------------- echo %1 = creatoolsGeneration echo %2 = creamaracassourcefolder echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + cmake -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt exit /B \ No newline at end of file diff --git a/Install/scripts/creaImageIO/creaImageIOInstall.bat b/Install/scripts/creaImageIO/creaImageIOInstall.bat index 98414c7..c2859e0 100644 --- a/Install/scripts/creaImageIO/creaImageIOInstall.bat +++ b/Install/scripts/creaImageIO/creaImageIOInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo compile creaImageIO call %baseFolder%\cleanmod.bat %creaimagesource% %creatoolsGeneration% >> %logFolder%\creaImageIOInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creaimagesource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaImageIOInstall.log 2>&1 -call %currentdir%\creaImageIOVariables.bat %creatoolsGeneration% %creaimagesource% %docgeneration% >> %logFolder%\creaImageIOInstall.log 2>&1 +call %currentdir%\creaImageIOVariables.bat %creatoolsGeneration% %creaimagesource% %docgeneration% %buildtype% >> %logFolder%\creaImageIOInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %creaimagesource% %creatoolsGeneration% >> %logFolder%\creaImageIOInstall.log 2>&1 call %baseFolder%\ctestmod.bat %creaimagesource% %creatoolsGeneration% >> %logFolder%\creaImageIOInstall.log 2>&1 echo end of creaImageIO compilation diff --git a/Install/scripts/creaImageIO/creaImageIOVariables.bat b/Install/scripts/creaImageIO/creaImageIOVariables.bat index 24720ac..401a12e 100644 --- a/Install/scripts/creaImageIO/creaImageIOVariables.bat +++ b/Install/scripts/creaImageIO/creaImageIOVariables.bat @@ -6,10 +6,15 @@ echo ---------------------------- echo %1 = creatoolsGeneration echo %2 = creaimagesource echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG: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 diff --git a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat index e2d1c3d..9499182 100644 --- a/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat +++ b/Install/scripts/creaMaracasVisu/creaMaracasVariables.bat @@ -6,10 +6,16 @@ echo ---------------------------- echo %1 = creatoolsGeneration echo %2 = creamaracassourcefolder echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + echo pechaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaan + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_creaMaracasVisu:BOOL=ON -D creaMaracasVisu_DOC:BOOL=%3 CMakeCache.txt cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMaracasVisu_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt diff --git a/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat b/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat index f1becb3..5993b68 100644 --- a/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat +++ b/Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo compile creaMaracasVisu call %baseFolder%\cleanmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creamaracassource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 -call %currentdir%\creaMaracasVariables.bat %creatoolsGeneration% %creamaracassource% %docgeneration% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 +call %currentdir%\creaMaracasVariables.bat %creatoolsGeneration% %creamaracassource% %docgeneration% %buildtype% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 call %baseFolder%\ctestmod.bat %creamaracassource% %creatoolsGeneration% >> %logFolder%\creaMaracasVisuInstall.log 2>&1 echo end of creaMaracasVisu compilation diff --git a/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat b/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat index fac2e8a..8056162 100644 --- a/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat +++ b/Install/scripts/creaRigidRegistration/creaRigidRInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo compile creaRigidRegistration call %baseFolder%\cleanmod.bat %crearigidregistrationssource% %creatoolsGeneration% >> %logFolder%\creaRigidRInstall.log 2>&1 call %baseFolder%\cmakemod.bat %crearigidregistrationssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaRigidRInstall.log 2>&1 -call %currentdir%\creaRigidRegistrationVariables.bat %creatoolsGeneration% %crearigidregistrationssource% %docgeneration% >> %logFolder%\creaRigidRInstall.log 2>&1 +call %currentdir%\creaRigidRegistrationVariables.bat %creatoolsGeneration% %crearigidregistrationssource% %docgeneration% %buildtype% >> %logFolder%\creaRigidRInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %crearigidregistrationssource% %creatoolsGeneration% >> %logFolder%\creaRigidRInstall.log 2>&1 call %baseFolder%\ctestmod.bat %crearigidregistrationssource% %creatoolsGeneration% >> %logFolder%\creaRigidRInstall.log 2>&1 echo end of creaRigidRegistration compilation diff --git a/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat b/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat index e641f49..641cfbe 100644 --- a/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat +++ b/Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat @@ -6,10 +6,15 @@ echo ---------------------------- echo %1 = creatoolsGeneration echo %2 = crearigidregistrationssource echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + cmake -D crea_DIR:PATH=%1\creatools_install\crea -D BUILD_BBTK_PACKAGE_PackRecalage:BOOL=ON CMakeCache.txt cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt cmake -D BUILD_creaRigidRegistration_DOC:BOOL=%3 -D BUILD_BBTK_PACKAGE_PackRecalage_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt diff --git a/Install/scripts/creaTools/creaMiniToolsVariables.bat b/Install/scripts/creaTools/creaMiniToolsVariables.bat index 6ad6cf1..e024399 100644 --- a/Install/scripts/creaTools/creaMiniToolsVariables.bat +++ b/Install/scripts/creaTools/creaMiniToolsVariables.bat @@ -6,10 +6,15 @@ echo ---------------------------- echo %1 = creatoolsGeneration echo %2 = creaminitoolssource echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + cmake -D crea_DIR:PATH=%1\creatools_install\crea CMakeCache.txt cmake -D BBTK_DIR:PATH=%1\creatools_install\bbtk CMakeCache.txt @@ -19,5 +24,9 @@ cmake -D BUILD_BBTK_PACKAGE_creaMiniTools_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMiniToolsBase:BOOL=ON -D creaMiniToolsBase_DOC:BOOL=%3 CMakeCache.txt cmake -D BUILD_BBTK_PACKAGE_creaMiniToolsBase_DOXYGEN_DOC:BOOL=%3 CMakeCache.txt +::cmake -D BUILD_BBTK_PACKAGE_creaMiniTools_BBS_APP:BOOL=ON CMakeCache.txt +cmake -D BUILD_BBTK_PACKAGE_creaMiniToolsBase_BBS_APP:BOOL=ON CMakeCache.txt + + cmake CMakeCache.txt diff --git a/Install/scripts/creaTools/creaMinitoolsInstall.bat b/Install/scripts/creaTools/creaMinitoolsInstall.bat index 1fed0af..196bae3 100644 --- a/Install/scripts/creaTools/creaMinitoolsInstall.bat +++ b/Install/scripts/creaTools/creaMinitoolsInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo Compile creaTools call %baseFolder%\cleanmod.bat %creaminitoolssource% %creatoolsGeneration% >> %logFolder%\creaMinitoolsInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creaminitoolssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaMinitoolsInstall.log 2>&1 -call %currentdir%\creaVariables.bat %creatoolsGeneration% %creaminitoolssource% %docgeneration% >> %logFolder%\creaMinitoolsInstall.log 2>&1 +call %currentdir%\creaMiniToolsVariables.bat %creatoolsGeneration% %creaminitoolssource% %docgeneration% %buildtype% >> %logFolder%\creaMinitoolsInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %creaminitoolssource% %creatoolsGeneration% >> %logFolder%\creaMinitoolsInstall.log 2>&1 ::call %baseFolder%\ctestmod.bat %creaminitoolssource% %creatoolsGeneration% >> %logFolder%\creaMinitoolsInstall.log 2>&1 echo end of creaMiniTools compilation diff --git a/Install/scripts/creaTools/creaToolsInstall.bat b/Install/scripts/creaTools/creaToolsInstall.bat index 6e41177..c62c98b 100644 --- a/Install/scripts/creaTools/creaToolsInstall.bat +++ b/Install/scripts/creaTools/creaToolsInstall.bat @@ -51,7 +51,7 @@ echo end setting variables echo Compile creaTools call %baseFolder%\cleanmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 call %baseFolder%\cmakemod.bat %creatoolssource% %installPrefix% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 -call %currentdir%\creaToolsVariables.bat %creatoolsGeneration% %creatoolssource% %docgeneration% >> %logFolder%\creaToolsInstall.log 2>&1 +call %currentdir%\creaToolsVariables.bat %creatoolsGeneration% %creatoolssource% %docgeneration% %buildtype% >> %logFolder%\creaToolsInstall.log 2>&1 call %baseFolder%\compilemod.bat %buildtype% %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 ::call %baseFolder%\ctestmod.bat %creatoolssource% %creatoolsGeneration% >> %logFolder%\creaToolsInstall.log 2>&1 echo end of creaTools compilation diff --git a/Install/scripts/creaTools/creaToolsVariables.bat b/Install/scripts/creaTools/creaToolsVariables.bat index 218d9d1..c7fd794 100644 --- a/Install/scripts/creaTools/creaToolsVariables.bat +++ b/Install/scripts/creaTools/creaToolsVariables.bat @@ -6,8 +6,13 @@ echo ---------------------------- echo %1 = creatoolsGeneration echo %2 = creatoolssource echo %3 = docgeneration +echo buildType = %4 set binfolder=%1\creatools_bin\%2Bin cd %binfolder% +IF %4==Debug ( + cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt +) + cmake -D CREATOOLS_SOURCE_PATH:PATH=%1\creatools_install CMakeCache.txt -- 2.47.0