X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2FcreaTools%2FcreaToolsVariables.bat;h=9d39674272221c88b107b20c1d48f50bfcbb0fa9;hb=66a0fd17afb0d675823e90b740b763dbe9941d7b;hp=c7fd7948749c4c6566334f1e22f5614e1100dfc0;hpb=202b0b1a7dc0552a8c4a9eb1c9c48b6866af6404;p=creaToolsTools.git

diff --git a/Install/scripts/creaTools/creaToolsVariables.bat b/Install/scripts/creaTools/creaToolsVariables.bat
index c7fd794..9d39674 100644
--- a/Install/scripts/creaTools/creaToolsVariables.bat
+++ b/Install/scripts/creaTools/creaToolsVariables.bat
@@ -1,18 +1,61 @@
+REM ---------------------------------------------------------------------
+REM
+REM Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+REM                        pour la Santé)
+REM Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+REM
+REM  This software is governed by the CeCILL-B license under French law and 
+REM  abiding by the rules of distribution of free software. You can  use, 
+REM  modify and/ or redistribute the software under the terms of the CeCILL-B 
+REM  license as circulated by CEA, CNRS and INRIA at the following URL 
+REM  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+REM  or in the file LICENSE.txt.
+REM
+REM  As a counterpart to the access to the source code and  rights to copy,
+REM  modify and redistribute granted by the license, users are provided only
+REM  with a limited warranty  and the software's author,  the holder of the
+REM  economic rights,  and the successive licensors  have only  limited
+REM  liability. 
+REM
+REM  The fact that you are presently reading this means that you have had
+REM  knowledge of the CeCILL-B license and that you accept its terms.
+REM ------------------------------------------------------------------------  
+
 @echo off
 echo ----------------------------
 echo ---creaToolVariables.bat----
 echo ----------------------------
 
-echo %1 = creatoolsGeneration
-echo %2 = creatoolssource
-echo %3 = docgeneration
-echo buildType = %4
+set creatoolsGeneration=%1
+set creatoolssource=%2
+set docgeneration=%3
+set buildType=%4
+set plateforme=%5
+
+echo creatoolsGeneration = %creatoolsGeneration%
+echo creatoolssource = %creatoolssource%
+echo docgeneration = %docgeneration%
+echo buildType = %buildType%
+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
 )
 
-cmake -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