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

[creaToolsTools.git] / Install / scripts / base / cmakemod.bat

diff --git a/Install/scripts/base/cmakemod.bat b/Install/scripts/base/cmakemod.bat
index 80241151f506f0cdfa8990d891a828d6b26fb77e..370f66f5a029ea9bd7a622e2ebbb0819a560619e 100644 (file)
--- a/Install/scripts/base/cmakemod.bat
+++ b/Install/scripts/base/cmakemod.bat
@@ -26,7 +26,7 @@ echo ----------------------------
 echo -------cmakemod.bat---------
 echo ----------------------------
 
-echo buildtype = %1 
+echo creasource = %1 
 echo installPrefix = %2
 echo creatoolsGeneration = %3
 
@@ -46,7 +46,7 @@ if not exist %vcvarsall% (
   exit
 )
 
-if %forcex86%==ON (
+if %platforme%==Win32 (
        call %vcvarsall%
        set "compilerVersion=Visual Studio 10"
        echo "Compilation forced x86"
@@ -58,10 +58,10 @@ if %forcex86%==ON (
        )
 )
 
-set binfolder=%3\creatools_bin\%1Bin
+set binfolder=%3\creatools_%buildtype%%platforme%\creatools_bin\%1Bin
 cd %binfolder%
 
-cmake -G"%compilerVersion%" -H%3\creatools_sources\%1 -B%3\creatools_bin\%1Bin
+cmake -G"%compilerVersion%" -H%3\creatools_sources\%1 -B%3\creatools_%buildtype%%platforme%\creatools_bin\%1Bin
 cmake -D INCLUDE_CTEST:BOOL=ON -D CMAKE_INSTALL_PREFIX:PATH=%2\%1 CMakeCache.txt
 
 exit /B
\ No newline at end of file