DFCH: Update for x84 and x64 bit compilation

[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..2e791bfd03c414963e46751a714e309c4e9f7ec7 100644 (file)
--- a/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
+++ b/Install_ThirdParty/scripts/install_thirdparty_dlls_cmake.bat
@@ -37,17 +37,26 @@ if not exist %vcvarsall% (
   exit
 )
 
-call %vcvarsall%
+if %PROCESSOR_ARCHITECTURE%==x86 (
+       call %vcvarsall%
+) else (
+       call %vcvarsall% amd64
+)
 
 mkdir %binpath%
 cd %binpath%
 
-cmake -G"Visual Studio 10"  -H%sourcepath% -B%binpath%
+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"