X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_dlls_cmake.bat;h=f1fe1b84e185c39244bf6fa25529574a0d43d633;hb=fe8e2a31c3cf13e55988297c8437635bd186eb0d;hp=abb2613c1e99526560c31afb63f736c6baba3dcd;hpb=be9323e35ba1081cc4d260388182ffbff3136869;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index abb2613..f1fe1b8 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -1,3 +1,26 @@
+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 -----Generating Installers of------
@@ -18,10 +41,10 @@ echo ----End Asking Architecture--------
 
 set thirdpartyGeneration=%1
 set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
 
-set version="3.0.1-win32"
-
 set thirdparty_cmake=%cd%\..\cmake
 
 set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
@@ -29,7 +52,6 @@ set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.
 set thirdpartydllspath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_dlls
 set sourcepath=%thirdparty_cmake%\crea_ThirdParty_dlls
 set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\crea_ThirdParty_dlls_Bin
-set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls"
 
 if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 if not exist %vcvarsall% (
@@ -37,23 +59,39 @@ if not exist %vcvarsall% (
   exit
 )
 
-call %vcvarsall%
+if %x86Comp%==ON (
+	call %vcvarsall%
+	set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls"
+	echo "Compilation forced x86"
+) else (
+	if %PROCESSOR_ARCHITECTURE%==x86 (
+		call %vcvarsall%
+		set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_dlls"
+	) else (
+		call %vcvarsall% amd64
+		set installpath="%ProgramFiles%\creatools\crea_ThirdParty_dlls"
+	)
+)
 
+rmdir /S /Q %binpath%
 mkdir %binpath%
 cd %binpath%
 
-cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+if %x86Comp%==ON (
+	cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+) else (
+	if %PROCESSOR_ARCHITECTURE%==x86 (
+		cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+	) else (
+		cmake -G"Visual Studio 10 Win64"  -H%sourcepath% -B%binpath%
+	)
+)
+
 cmake -D CMAKE_INSTALL_PREFIX:PATH=%installpath% CMakeCache.txt
 cmake -D CREA_LIBRARY_DLL_PATH:PATH=%thirdpartydllspath% CMakeCache.txt
 cmake CMakeCache.txt
+
 FOR /R %%a IN (*.sln) DO msbuild %%a /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType%
 msbuild /m:%NUMBER_OF_PROCESSORS% /p:UseEnv=true;BuildInParallel=true;Configuration=%buildType% PACKAGE.vcxproj
 
-set installerPath="%thirdpartydllspath%\thirdparty_bin\crea_ThirdParty_dlls_Bin\crea_ThirdParty_dlls-%version%.exe"
-
-if exist installerPath (
-mkdir %thirdpartyGeneration%\thirdparty_installers
-move /Y %installerPath% %thirdpartyGeneration%\thirdparty_installers
-)
-
 exit /B
\ No newline at end of file