X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_dlls_cmake.bat;h=d6b08558371833abab72657cb3825bd6ae16f08b;hb=a97bd22a8b4daa4d950b2ecd17e239c5b8ddd281;hp=c1929dc60d78127752e8ce3f4679eee73c64efaf;hpb=5201a716e21229a5ec4e043be075b92282146c2b;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index c1929dc..d6b0855 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -17,7 +17,10 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 echo ----End Asking Architecture--------
 
 set thirdpartyGeneration=%1
-set version="3.0.1-win32"
+set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
+
 
 set thirdparty_cmake=%cd%\..\cmake
 
@@ -25,8 +28,7 @@ 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\crea_ThirdParty_dlls_Bin
-set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_dlls"
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\crea_ThirdParty_dlls_Bin
 
 if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 if not exist %vcvarsall% (
@@ -34,28 +36,43 @@ if not exist %vcvarsall% (
   exit
 )
 
-call %vcvarsall%
-
-rmdir %binpath% /s /q
+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 (
+	set buildPlatform=win32
+	cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+) else (
+	if %PROCESSOR_ARCHITECTURE%==x86 (
+		set buildPlatform=win32
+		cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+	) else (
+		set buildPlatform=win64
+		cmake -G"Visual Studio 10 Win64"  -H%sourcepath% -B%binpath%
+	)
+)
+
+cmake -D CREATOOLS_BUILDTYPE:STRING=%buildType% -D CREATOOLS_PLATFORM:STRING=%buildPlatform%  CMakeCache.txt
 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
-rmdir %binpath% /s /q
-rmdir %thirdpartydllspath% /s /q
-)
+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