X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FcreaTools%2FcreaToolsVariables.bat;h=9d39674272221c88b107b20c1d48f50bfcbb0fa9;hb=d2694504db1df749aaf7647fb5ddc69c5dbe0c52;hp=39dd16d8e430b35ca3549de8bdfa319ee4b976b8;hpb=a6ea55e29de1488efd3453ee1e50f565b1afc099;p=creaToolsTools.git

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