DFCH: ThirdParty Libraries installer generator working -- script tested and updated...

[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 aa2f07b95779b46740ef65a0e7427df21d53e1eb..cb2116f1e74239b0c177cfaa1961a4882791f2c9 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -18,6 +18,8 @@ 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"
@@ -37,17 +39,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
+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"