]> Creatis software - creaToolsTools.git/commitdiff
DFCH: creaTools windows x64 Release/Debug script
authorDiego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Tue, 24 Jul 2012 13:34:27 +0000 (13:34 +0000)
committerDiego Caceres <Diego.Caceres@creatis.insa-lyon.fr>
Tue, 24 Jul 2012 13:34:27 +0000 (13:34 +0000)
Feature #1530
Feature #1531

22 files changed:
Install/scripts/bbtk/bbtkInstall.bat
Install/scripts/bbtk/bbtkVariables.bat
Install/scripts/bbtkGEditor/bbtkGEditorInstall.bat
Install/scripts/bbtkGEditor/bbtkGEditorVariables.bat
Install/scripts/crea/creaInstall.bat
Install/scripts/crea/creaVariables.bat
Install/scripts/creaBruker/creaBrukerInstall.bat
Install/scripts/creaBruker/creaBrukerVariables.bat
Install/scripts/creaContours/creaContoursInstall.bat
Install/scripts/creaContours/creaContoursVariables.bat
Install/scripts/creaEnvironment/creaEnvironmentInstall.bat
Install/scripts/creaEnvironment/creaenvironmentVariables.bat
Install/scripts/creaImageIO/creaImageIOInstall.bat
Install/scripts/creaImageIO/creaImageIOVariables.bat
Install/scripts/creaMaracasVisu/creaMaracasVariables.bat
Install/scripts/creaMaracasVisu/creaMaracasVisuInstall.bat
Install/scripts/creaRigidRegistration/creaRigidRInstall.bat
Install/scripts/creaRigidRegistration/creaRigidRegistrationVariables.bat
Install/scripts/creaTools/creaMiniToolsVariables.bat
Install/scripts/creaTools/creaMinitoolsInstall.bat
Install/scripts/creaTools/creaToolsInstall.bat
Install/scripts/creaTools/creaToolsVariables.bat

index 29010e6dfb4b79bae75c0e718c6fff9eaa535e4b..1e4438b74958d14b5ba2107cfbff137622fc5fa7 100644 (file)
@@ -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
index c6d88f7f384fd2391b84aaa996db7ccffe70e86a..90a5d3029ebe7673ed0feb5be109c80861311f86 100644 (file)
@@ -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
 
index d1ad674baa8a49f0407db86a4748fb40db19c824..a2cb234ef9fb5c9cddbce34f86906efdec4e6a64 100644 (file)
@@ -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
index 76be7726d03c605467bce953aa19ff7820f4f5e0..5dc762bfb3500de36830da7c8346e00f0b214ced 100644 (file)
@@ -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
index 8ec14e79d98fccfac94c380a736eaade28035223..839b4ba098d85ae4974259a8a8ae31d2d906760d 100644 (file)
@@ -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
 
index 1bce3a9284e9324d289a82cc7a85d10935cb5885..0ba113c933370f8b52aa82df5d0448528b32e79c 100644 (file)
@@ -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
 )
 
index 8c354bb6b95e0cb78517bc020dca10e84f08255c..07d9cb951377ef18011e75b7d9d25b2ae8ca21f3 100644 (file)
@@ -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
 
index 5d149fc65c5c6693f397992eddab5e4793d0c8fb..634bc9243b5a7886322fc8c03002e994846ed2af 100644 (file)
@@ -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
index 398c96555ae64f28d847284d4ceb8e1207d8f441..3b39c7ec96aef61fe6b1ba4cec0a940222211a2a 100644 (file)
@@ -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
index fc2b60ee0a2f158ed6613827dec2631731126392..59bcc7472c18eae8cf3728c8ee0fac49b4b46d5d 100644 (file)
@@ -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
index d1324437727c32bfb2b79eb7220d7cbbbe8e045c..26acb83d41b0fcb0f810859a865b16be424f500d 100644 (file)
@@ -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
index e2fc3ee713d52c00c65146b480a8dce4afdeac90..f5b86f61196ac8f9a7e4dcef9bd870ac2a3a115c 100644 (file)
@@ -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
index 98414c726be0880d3a66d9e1fc8a9d2c88416c09..c2859e08aa837f896839a4ef59c9d64d4e2a1c8e 100644 (file)
@@ -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
index 24720acd2e95c4d39cfb3e3ccbdcce7daec2e0da..401a12e061a0dd729edd1b085d2ba5f5ca0ed644 100644 (file)
@@ -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
index e2d1c3d25c4c02f7535a4b18790d4aac13c82b60..949918299e9117f6df68cfbb49e7f990693e190a 100644 (file)
@@ -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
index f1becb399d49204ae7de121821a1550eef093ce3..5993b68030aff63e3440e70e772f23019889536a 100644 (file)
@@ -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
index fac2e8af1220b1b4058caa6086133b208e651c19..8056162615964b727f20d931789f710069b6cbb0 100644 (file)
@@ -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
index e641f49c12363ea8775d8211fc9e3a9564509567..641cfbe2c3287d559448afce0653af6bb484e126 100644 (file)
@@ -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
index 6ad6cf1e96acfa020d545040679feed9d674f63b..e024399628b2d06d33401699fd522c4871a3d229 100644 (file)
@@ -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
 
index 1fed0af22d33f0936061de6e408ffd02abf98c6b..196bae350bb4b032f739ac5877e7912dda9fe519 100644 (file)
@@ -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
index 6e411773a7798c81877317b9c8dd97359f3a8244..c62c98bc888c330acfe53e8167cd95b55f93aa82 100644 (file)
@@ -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
index 218d9d1ffc583028a44b63cdc27af347f357342d..c7fd7948749c4c6566334f1e22f5614e1100dfc0 100644 (file)
@@ -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