X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FcreaTools%2FcreaToolsVariables.bat;h=cbe87d81f50003a01adfd23c910ded1345a9a4d2;hb=5ed8289ffa9643c12d6d22f4829aa131018e9dcc;hp=39dd16d8e430b35ca3549de8bdfa319ee4b976b8;hpb=718bd64a6acbaedc81791f940d04258008f7cfc9;p=creaToolsTools.git

diff --git a/Install/scripts/creaTools/creaToolsVariables.bat b/Install/scripts/creaTools/creaToolsVariables.bat
index 39dd16d..cbe87d8 100644
--- a/Install/scripts/creaTools/creaToolsVariables.bat
+++ b/Install/scripts/creaTools/creaToolsVariables.bat
@@ -26,10 +26,19 @@ 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 forcex86=%5
+
+echo creatoolsGeneration = %creatoolsGeneration%
+echo creatoolssource = %creatoolssource%
+echo docgeneration = %docgeneration%
+echo buildType = %buildType%
+echo forcex86 = %forcex86%
+
+
 
 set binfolder=%1\creatools_bin\%2Bin
 cd %binfolder%
@@ -38,4 +47,15 @@ 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 %forcex86%==ON (
+	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_install CMakeCache.txt