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

[boost-modular-build-helper] Support boost architecture arm+x86 (#25294) (#25299)

Browse Source 
* [boost-modular-build-helper] Support boost architecture arm+x86 (#25294)

* [boost-modular-build-helper] Update port version (#25294)

* [boost-modular-build-helper] Update boost dual architecture check (#25294)

* [boost-modular-build-helper] Update port version references(#25294)

Co-authored-by: Simen August Tinderholt <simen.tinderholt@nordicsemi.no>
This commit is contained in:
Simen August Tinderholt 2022-06-23 23:16:30 +02:00 committed by GitHub
parent 50fe35a3c3
commit f93b8354d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,8 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STR
list(APPEND B2_OPTIONS architecture=arm) list(APPEND B2_OPTIONS architecture=arm)
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le") elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "ppc64le")
list(APPEND B2_OPTIONS architecture=power) list(APPEND B2_OPTIONS architecture=power)
elseif("arm64" IN_LIST VCPKG_TARGET_ARCHITECTURE AND "x86_64" IN_LIST VCPKG_TARGET_ARCHITECTURE)
list(APPEND B2_OPTIONS architecture=arm+x86)
else() else()
list(APPEND B2_OPTIONS architecture=x86) list(APPEND B2_OPTIONS architecture=x86)
endif() endif()

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

@ -1,7 +1,7 @@
{ {
"name": "boost-modular-build-helper", "name": "boost-modular-build-helper",
"version": "1.79.0", "version": "1.79.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": [

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

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "e416ef5af7f6a850fd3ee6493fb3a359cd7ac6ba",
"version": "1.79.0",
"port-version": 3
},
{ {
"git-tree": "e02a1f1b06a492d932f309feab8ac7751b0327ca", "git-tree": "e02a1f1b06a492d932f309feab8ac7751b0327ca",
"version": "1.79.0", "version": "1.79.0",

2
versions/baseline.json
View File

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