X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install%2Fscripts%2Fbase%2Fcmakemod.bat;h=370f66f5a029ea9bd7a622e2ebbb0819a560619e;hb=d2694504db1df749aaf7647fb5ddc69c5dbe0c52;hp=d0880c9f23b88d99eeb44f7d10e8f406cea7ed21;hpb=bfd50d81b1a0115d5de2ceb5c083a47bee67005a;p=creaToolsTools.git

diff --git a/Install/scripts/base/cmakemod.bat b/Install/scripts/base/cmakemod.bat
index d0880c9..370f66f 100644
--- a/Install/scripts/base/cmakemod.bat
+++ b/Install/scripts/base/cmakemod.bat
@@ -1,11 +1,34 @@
+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 -------cmakemod.bat---------
 echo ----------------------------
 
-echo Module Sources  Ex. crea bbbtk creaMaracasVisu... = %1
+echo creasource = %1 
 echo installPrefix = %2
-echo creatoolsGeneration %3
+echo creatoolsGeneration = %3
 
 echo Architecture found = %PROCESSOR_ARCHITECTURE%
 if %PROCESSOR_ARCHITECTURE%==x86  (
@@ -23,16 +46,22 @@ if not exist %vcvarsall% (
   exit
 )
 
-if %PROCESSOR_ARCHITECTURE%==x86 (
+if %platforme%==Win32 (
 	call %vcvarsall%
+	set "compilerVersion=Visual Studio 10"
+	echo "Compilation forced x86"
 ) else (
-	call %vcvarsall% amd64
+	if %PROCESSOR_ARCHITECTURE%==x86 (
+		call %vcvarsall%
+	) else (
+		call %vcvarsall% amd64
+	)
 )
 
-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