X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_dlls_cmake.bat;h=4dcafb0e586cb4089b8585d4d799d8346ebad50f;hb=202b0b1a7dc0552a8c4a9eb1c9c48b6866af6404;hp=aa2f07b95779b46740ef65a0e7427df21d53e1eb;hpb=4a364787d3f71bd8010767cd1b7ec3befda665f4;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index aa2f07b..4dcafb0 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -18,10 +18,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"
@@ -37,23 +37,35 @@ if not exist %vcvarsall% (
   exit
 )
 
-call %vcvarsall%
+if %x86Comp%==ON (
+	call %vcvarsall%
+	echo "Compilation forced x86"
+) else (
+	if %PROCESSOR_ARCHITECTURE%==x86 (
+		call %vcvarsall%
+	) else (
+		call %vcvarsall% amd64
+	)
+)
 
 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 /p:Configuration=%buildType%
-msbuild /p:Configuration=release 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
-)
+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
 
 exit /B
\ No newline at end of file