X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Install_ThirdParty%2Fscripts%2Finstall_thirdparty_libraries_cmake.bat;h=2f5f5b45ef590814bb44e5a5ad5cea1aeee925c1;hb=5476a2eacc76bd030d5e2c4050c78500177fc1f9;hp=d519734e316ee1b8643d28a1d43015e78fa04007;hpb=706b0ca702c02384f0628497756f1cb9b1a4ed21;p=creaToolsTools.git

diff --git a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
index d519734..2f5f5b4 100644
--- a/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_libraries_cmake.bat
@@ -17,6 +17,9 @@ if %PROCESSOR_ARCHITECTURE%==x86 (
 echo ----End Asking Architecture--------
 
 set thirdpartyGeneration=%1
+set buildType=%2
+::The following line is to force x86 or x64 compilation
+set x86Comp=%3
 
 set thirdparty_cmake=%cd%\..\cmake
 
@@ -24,8 +27,7 @@ set vcvarsall="%ProgramFilesPath_x86%\Microsoft Visual Studio 10.0\VC\vcvarsall.
 
 set thirdpartylibpath=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries
 set sourcepath=%thirdparty_cmake%\crea_ThirdParty_Libraries
-set binpath=%thirdpartyGeneration%\thirdparty_bin\creaTPLBin
-set installpath="ProgramFilesPath_x86\creatools\crea_ThirdParty_Libraries"
+set binpath=%thirdpartyGeneration%\thirdparty_bin\%buildType%\creaTPLBin
 
 if not exist %vcvarsall% set zipPath="%ProgramFilesPath_x64%\Microsoft Visual Studio 10.0\VC\vcvarsall.bat"
 if not exist %vcvarsall% (
@@ -33,18 +35,41 @@ if not exist %vcvarsall% (
   exit
 )
 
-call %vcvarsall%
-
-rmdir %binpath% /s /q
+if %x86Comp%==ON (
+	call %vcvarsall%
+	echo "Compilation forced x86"
+) else (
+	if %PROCESSOR_ARCHITECTURE%==x86 (
+		set installpath="%ProgramFilesPath_x86%\creatools\crea_ThirdParty_Libraries"
+		call %vcvarsall%
+	) else (
+		set installpath="%ProgramFiles%\creatools\crea_ThirdParty_Libraries"
+		call %vcvarsall% amd64
+	)
+)
 
+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_SOURCE_PATH:PATH=%thirdpartylibpath% CMakeCache.txt
 cmake CMakeCache.txt
-FOR /R %%a IN (*.sln) DO msbuild %%a /p:Configuration=%buildType%
-msbuild /p:Configuration=release PACKAGE.vcxproj
+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