DFCH: Feature #1524

[creaToolsTools.git] / Install_ThirdParty / scripts / install_thirdparty_dlls_cmake.bat

diff --git a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
index d0e1f5b81211f980fcd92f2fb7b4ba3cc91afbcd..4dcafb0e586cb4089b8585d4d799d8346ebad50f 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -1,5 +1,9 @@
 @echo off
 echo -----------------------------------
+echo -----Generating Installers of------
+echo -------creaThirdPartyDlls----------
+echo -----------------------------------
+echo -----------------------------------
 echo ------Asking Architecture----------
 echo -----------------------------------
 if %PROCESSOR_ARCHITECTURE%==x86 (
@@ -13,6 +17,10 @@ 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
 
@@ -20,7 +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 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"
@@ -29,15 +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
-@echo on
\ No newline at end of file
+
+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