Feature 2004 Windows generation creatools installer. Merging in one proces Debug...

[creaToolsTools.git] / Install / scripts / creaTools / creaToolsVariables.bat

diff --git a/Install/scripts/creaTools/creaToolsVariables.bat b/Install/scripts/creaTools/creaToolsVariables.bat
index cbe87d81f50003a01adfd23c910ded1345a9a4d2..9d39674272221c88b107b20c1d48f50bfcbb0fa9 100644 (file)
--- a/Install/scripts/creaTools/creaToolsVariables.bat
+++ b/Install/scripts/creaTools/creaToolsVariables.bat
@@ -30,24 +30,24 @@ set creatoolsGeneration=%1
 set creatoolssource=%2
 set docgeneration=%3
 set buildType=%4
-set forcex86=%5
+set plateforme=%5
 
 echo creatoolsGeneration = %creatoolsGeneration%
 echo creatoolssource = %creatoolssource%
 echo docgeneration = %docgeneration%
 echo buildType = %buildType%
-echo forcex86 = %forcex86%
+echo plateforme = %plateforme%
 
 
 
-set binfolder=%1\creatools_bin\%2Bin
+set binfolder=%1\creatools_%buildtype%%platforme%\creatools_bin\%2Bin
 cd %binfolder%
 
 IF %4==Debug (
        cmake -D WXWIDGETS_USE_DEBUG:BOOL=ON CMakeCache.txt
 )
 
-if %forcex86%==ON (
+if %platforme%==Win32 (
        set buildPlatform=win32
 ) else (
        if %PROCESSOR_ARCHITECTURE%==x86 (
@@ -58,4 +58,4 @@ if %forcex86%==ON (
 )
 
 cmake -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform%  CMakeCache.txt
-cmake -D CREATOOLS_SOURCE_PATH:PATH=%creatoolsGeneration%\creatools_install CMakeCache.txt
+cmake -D CREATOOLS_SOURCE_PATH:PATH=%creatoolsGeneration%\creatools_%buildtype%%platforme%\creatools_install CMakeCache.txt