Boost builds respect VCPKG_MAX_CONCURRENCY (#27465)

* respects VCPKG_MAX_CONCURRENCY * bump port version * x-add-version
microsoft · Oct 27, 2022 · c72cefb · c72cefb
1 parent 1be5a98
commit c72cefb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/ports/boost-modular-build-helper/CMakeLists.txt b/ports/boost-modular-build-helper/CMakeLists.txt
@@ -188,11 +188,6 @@ if(NOT WIN32)
     list(APPEND B2_OPTIONS "--layout=system")
 endif()
 
-include(ProcessorCount)
-ProcessorCount(NUMBER_OF_PROCESSORS)
-if(NOT NUMBER_OF_PROCESSORS)
-    set(NUMBER_OF_PROCESSORS 1)
-endif()
 
 # Handle ICU
 if(WIN32)
@@ -274,7 +269,7 @@ add_custom_target(boost ALL
         --with-system
         --with-thread
         --with-chrono
-        -j${NUMBER_OF_PROCESSORS}
+        -j ${VCPKG_CONCURRENCY}
         -sBOOST_ROOT=${BOOST_BUILD_PATH}
         -sBOOST_BUILD_PATH=${BOOST_BUILD_PATH}
         --debug-configuration

diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -116,7 +116,7 @@ function(boost_modular_build)
     )
 
     vcpkg_cmake_configure(
-        SOURCE_PATH ${BOOST_BUILD_INSTALLED_DIR}/share/boost-build
+        SOURCE_PATH "${BOOST_BUILD_INSTALLED_DIR}/share/boost-build"
         GENERATOR Ninja
         OPTIONS
             "-DPORT=${PORT}"
@@ -128,6 +128,7 @@ function(boost_modular_build)
             "-DBOOST_BUILD_PATH=${BOOST_BUILD_PATH}"
             "-DVCPKG_CRT_LINKAGE=${VCPKG_CRT_LINKAGE}"
             "-DVCPKG_CMAKE_VARS_FILE=${cmake_vars_file}"
+            "-DVCPKG_CONCURRENCY=${VCPKG_CONCURRENCY}"
             ${configure_options}
         MAYBE_UNUSED_VARIABLES
             FEATURES

diff --git a/ports/boost-modular-build-helper/vcpkg.json b/ports/boost-modular-build-helper/vcpkg.json
@@ -2,7 +2,7 @@
   "$comment": "When changing this file also update and run scripts/boost/generate-ports.ps1",
   "name": "boost-modular-build-helper",
   "version": "1.80.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Internal vcpkg port used to build Boost libraries",
   "license": "MIT",
   "dependencies": [

diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1
@@ -99,7 +99,7 @@ $portVersions = @{
     "boost-logic" = 1;
     "boost-math" = 1;
     "boost-metaparse" = 1;
-    "boost-modular-build-helper" = 2;
+    "boost-modular-build-helper" = 3;
     "boost-move" = 1;
     "boost-mp11" = 1;
     "boost-mpi" = 1;

diff --git a/versions/b-/boost-modular-build-helper.json b/versions/b-/boost-modular-build-helper.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4a8c162e2661795b998a8435b6ec7207608fe73a",
+      "version": "1.80.0",
+      "port-version": 3
+    },
     {
       "git-tree": "c01b4620588f657e9e4005fa5f9d9a649a8feba9",
       "version": "1.80.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -862,7 +862,7 @@
     },
     "boost-modular-build-helper": {
       "baseline": "1.80.0",
-      "port-version": 2
+      "port-version": 3
     },
     "boost-move": {
       "baseline": "1.80.0",