From e2d3b3734f196894deb1f1ca263c54d2dbc02cd7 Mon Sep 17 00:00:00 2001
From: Stinkfist0 <stinkfist0@gmail.com>
Date: Mon, 7 Dec 2015 16:30:08 +0200
Subject: [PATCH] Use IFCOS_NUM_BUILD_PROCS also in build-ifcopenshell.cmd and
 install-ifcopenshell.cmd.

---
 win/build-deps.cmd           | 2 +-
 win/build-ifcopenshell.cmd   | 8 +++++++-
 win/install-ifcopenshell.cmd | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/win/build-deps.cmd b/win/build-deps.cmd
index bc8e68768f..0cc6b53086 100644
--- a/win/build-deps.cmd
+++ b/win/build-deps.cmd
@@ -106,7 +106,7 @@ echo   - Use Python 2 instead of 3.
 echo     Set to TRUE if you wish to use Python 2 instead of 3. Has no effect if IFCOS_INSTALL_PYTHON is not TRUE.
 call cecho.cmd 0 13 "* IFCOS_NUM_BUILD_PROCS`t= %IFCOS_NUM_BUILD_PROCS%"
 echo   - How many MSBuild.exe processes may be run in parallel.
-echo     Defaults to NUMBER_OF_PROCESSORS.
+echo     Defaults to NUMBER_OF_PROCESSORS. Used also by other IfcOpenShell build scripts.
 echo.
 
 call :PrintUsage
diff --git a/win/build-ifcopenshell.cmd b/win/build-ifcopenshell.cmd
index ac973b6e06..c08858ae85 100644
--- a/win/build-ifcopenshell.cmd
+++ b/win/build-ifcopenshell.cmd
@@ -23,6 +23,7 @@
 
 @echo off
 set PROJECT_NAME=IfcOpenShell
+echo.
 
 :: Enable the delayed environment variable expansion needed in VSConfig.cmd.
 setlocal EnableDelayedExpansion
@@ -30,8 +31,13 @@ call vs-cfg.cmd %1 %2
 IF NOT %ERRORLEVEL%==0 GOTO :Error
 
 echo.
+IF "%IFCOS_NUM_BUILD_PROCS%"=="" set IFCOS_NUM_BUILD_PROCS=%NUMBER_OF_PROCESSORS%
+call cecho.cmd 0 13 "* IFCOS_NUM_BUILD_PROCS`t= %IFCOS_NUM_BUILD_PROCS%"
+echo.
+
 call cecho.cmd 0 13 "Building %VS_PLATFORM% %BUILD_CFG% %PROJECT_NAME%"
-MSBuild ..\%BUILD_DIR%\%PROJECT_NAME%.sln /nologo /m /p:Platform=%VS_PLATFORM% /p:Configuration=%BUILD_CFG% %3 %4 %5 %6 %7 %8 %9
+MSBuild ..\%BUILD_DIR%\%PROJECT_NAME%.sln /nologo /m:%IFCOS_NUM_BUILD_PROCS% /p:Platform=%VS_PLATFORM% ^
+    /p:Configuration=%BUILD_CFG% %3 %4 %5 %6 %7 %8 %9
 IF NOT %ERRORLEVEL%==0 GOTO :Error
 
 echo.
diff --git a/win/install-ifcopenshell.cmd b/win/install-ifcopenshell.cmd
index be2c348c13..d112772a90 100644
--- a/win/install-ifcopenshell.cmd
+++ b/win/install-ifcopenshell.cmd
@@ -23,6 +23,7 @@
 
 @echo off
 set PROJECT_NAME=IfcOpenShell
+echo.
 
 :: Enable the delayed environment variable expansion needed in VSConfig.cmd.
 setlocal EnableDelayedExpansion
@@ -30,8 +31,13 @@ call vs-cfg.cmd %1 %2
 IF NOT %ERRORLEVEL%==0 GOTO :Error
 
 echo.
+IF "%IFCOS_NUM_BUILD_PROCS%"=="" set IFCOS_NUM_BUILD_PROCS=%NUMBER_OF_PROCESSORS%
+call cecho.cmd 0 13 "* IFCOS_NUM_BUILD_PROCS`t= %IFCOS_NUM_BUILD_PROCS%"
+echo.
+
 call cecho.cmd 0 13 "Installing %VS_PLATFORM% %BUILD_CFG% %PROJECT_NAME%"
-MSBuild ..\%BUILD_DIR%\INSTALL.%VCPROJ_FILE_EXT% /nologo /m /p:Platform=%VS_PLATFORM% /p:Configuration=%BUILD_CFG% %3 %4 %5 %6 %7 %8 %9
+MSBuild ..\%BUILD_DIR%\INSTALL.%VCPROJ_FILE_EXT% /nologo /m:%IFCOS_NUM_BUILD_PROCS% /p:Platform=%VS_PLATFORM% ^
+    /p:Configuration=%BUILD_CFG% %3 %4 %5 %6 %7 %8 %9
 IF NOT %ERRORLEVEL%==0 GOTO :Error
 
 echo.