3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 11:21:12 +08:00
Code Issues Projects Releases Wiki Activity

Boost builds respect VCPKG_MAX_CONCURRENCY (#27465)

Browse Source 
* respects 	VCPKG_MAX_CONCURRENCY

* bump port version

* x-add-version
This commit is contained in:
Javier Matos Denizac 2022-10-26 19:29:08 -07:00 committed by GitHub
parent 1be5a98d09
commit c72cefb255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/boost-modular-build-helper/CMakeLists.txt
View File

@ -188,11 +188,6 @@ if(NOT WIN32)
list(APPEND B2_OPTIONS "--layout=system") list(APPEND B2_OPTIONS "--layout=system")
endif() endif()
include(ProcessorCount)
ProcessorCount(NUMBER_OF_PROCESSORS)
if(NOT NUMBER_OF_PROCESSORS)
set(NUMBER_OF_PROCESSORS 1)
endif()
# Handle ICU # Handle ICU
if(WIN32) if(WIN32)
@ -274,7 +269,7 @@ add_custom_target(boost ALL
--with-system --with-system
--with-thread --with-thread
--with-chrono --with-chrono
-j${NUMBER_OF_PROCESSORS} -j ${VCPKG_CONCURRENCY}
-sBOOST_ROOT=${BOOST_BUILD_PATH} -sBOOST_ROOT=${BOOST_BUILD_PATH}
-sBOOST_BUILD_PATH=${BOOST_BUILD_PATH} -sBOOST_BUILD_PATH=${BOOST_BUILD_PATH}
--debug-configuration --debug-configuration

3
ports/boost-modular-build-helper/boost-modular-build.cmake
View File

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

2
ports/boost-modular-build-helper/vcpkg.json
View File

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

2
scripts/boost/generate-ports.ps1
View File

@ -99,7 +99,7 @@ $portVersions = @{
"boost-logic" = 1; "boost-logic" = 1;
"boost-math" = 1; "boost-math" = 1;
"boost-metaparse" = 1; "boost-metaparse" = 1;
"boost-modular-build-helper" = 2; "boost-modular-build-helper" = 3;
"boost-move" = 1; "boost-move" = 1;
"boost-mp11" = 1; "boost-mp11" = 1;
"boost-mpi" = 1; "boost-mpi" = 1;

5
versions/b-/boost-modular-build-helper.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "4a8c162e2661795b998a8435b6ec7207608fe73a",
"version": "1.80.0",
"port-version": 3
},
{ {
"git-tree": "c01b4620588f657e9e4005fa5f9d9a649a8feba9", "git-tree": "c01b4620588f657e9e4005fa5f9d9a649a8feba9",
"version": "1.80.0", "version": "1.80.0",

2
versions/baseline.json
View File

@ -862,7 +862,7 @@
}, },
"boost-modular-build-helper": { "boost-modular-build-helper": {
"baseline": "1.80.0", "baseline": "1.80.0",
"port-version": 2 "port-version": 3
}, },
"boost-move": { "boost-move": {
"baseline": "1.80.0", "baseline": "1.80.0",