mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:01:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[boost-modular-build-helper] Do not force initialize B2_OPTIONS (#37414)

Browse Source
This commit is contained in:
MonicaLiu 2024-03-19 13:12:52 -07:00 committed by GitHub
parent 49e80bf57c
commit 7ef729383a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,11 @@ set(USER_CONFIG_TOOLSET_OPTIONS "")
set(USER_CONFIG_EXTRA_LINES "")
set(USER_CONFIG_REQUIREMENTS "")
set(B2_OPTIONS "")
# Avoid forcing initialization of B2_OPTIONS here to allow some users to add custom configuration options to this command via VCPKG_CHAINLOAD_TOOLCHAIN_FILE.
if(NOT DEFINED B2_OPTIONS)
set(B2_OPTIONS "")
endif()
include("${VCPKG_CMAKE_VARS_FILE}")
@ -247,6 +251,9 @@ if(NOT python_versions STREQUAL "")
endif()
endif()
# Remove duplicates from B2_OPTIONS since VCPKG_CHAINLOAD_TOOLCHAIN_FILE may be loaded multiple times in some cases.
list(REMOVE_DUPLICATES B2_OPTIONS)
if("${PORT}" STREQUAL "boost-mpi" OR "${PORT}" STREQUAL "boost-graph-parallel")
string(APPEND USER_CONFIG_EXTRA_LINES
"using mpi : : <library-path>\"${CURRENT_INSTALLED_DIR}/lib\"\n"

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

@ -2,7 +2,7 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-modular-build-helper",
"version": "1.84.0",
"port-version": 2,
"port-version": 3,
"description": "Internal vcpkg port used to build Boost libraries",
"license": "MIT",
"dependencies": [

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

@ -27,7 +27,7 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
# Clear this array when moving to a new boost version
$defaultPortVersion = 0
$portVersions = @{
'boost-modular-build-helper' = 2;
'boost-modular-build-helper' = 3;
}
function Get-PortVersion {

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

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "04390ecd44200648eb89147cb4e11b196d2dc515",
"version": "1.84.0",
"port-version": 3
},
{
"git-tree": "b3eb3e3fdc08ffe6e8f9e19e761e583790aaf308",
"version": "1.84.0",

2
versions/baseline.json
View File

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