mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[boost-modular-build-helper] Support VS2022 17.10 (#36605)
This commit is contained in:
parent
5b42fc02a3
commit
66b4b34d99
@ -63,8 +63,16 @@ if(VCPKG_DETECTED_MSVC)
|
|||||||
set(USER_CONFIG_TOOLSET msvc)
|
set(USER_CONFIG_TOOLSET msvc)
|
||||||
if(VCPKG_DETECTED_MSVC_VERSION LESS "1900")
|
if(VCPKG_DETECTED_MSVC_VERSION LESS "1900")
|
||||||
math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60")
|
math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 60")
|
||||||
|
elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1910")
|
||||||
|
set(USER_CONFIG_TOOLSET_VERSION "140")
|
||||||
|
elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1920")
|
||||||
|
set(USER_CONFIG_TOOLSET_VERSION "141")
|
||||||
|
elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1930")
|
||||||
|
set(USER_CONFIG_TOOLSET_VERSION "142")
|
||||||
|
elseif(VCPKG_DETECTED_MSVC_VERSION LESS "1950")
|
||||||
|
set(USER_CONFIG_TOOLSET_VERSION "143")
|
||||||
else()
|
else()
|
||||||
math(EXPR USER_CONFIG_TOOLSET_VERSION "${VCPKG_DETECTED_MSVC_VERSION} / 10 - 50")
|
message(FATAL_ERROR "Unsupported MSVC version: ${VCPKG_DETECTED_MSVC_VERSION}")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
|
elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "wasm32")
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
|
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
|
||||||
"name": "boost-modular-build-helper",
|
"name": "boost-modular-build-helper",
|
||||||
"version": "1.84.0",
|
"version": "1.84.0",
|
||||||
"port-version": 1,
|
"port-version": 2,
|
||||||
"description": "Internal vcpkg port used to build Boost libraries",
|
"description": "Internal vcpkg port used to build Boost libraries",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
|
@ -27,7 +27,7 @@ $semverVersion = ($version -replace "(\d+(\.\d+){1,3}).*", "`$1")
|
|||||||
# Clear this array when moving to a new boost version
|
# Clear this array when moving to a new boost version
|
||||||
$defaultPortVersion = 0
|
$defaultPortVersion = 0
|
||||||
$portVersions = @{
|
$portVersions = @{
|
||||||
'boost-modular-build-helper' = 1;
|
'boost-modular-build-helper' = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
function Get-PortVersion {
|
function Get-PortVersion {
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "b3eb3e3fdc08ffe6e8f9e19e761e583790aaf308",
|
||||||
|
"version": "1.84.0",
|
||||||
|
"port-version": 2
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "dc7e88a84383b497c7d9e117a00319fd2b2ded98",
|
"git-tree": "dc7e88a84383b497c7d9e117a00319fd2b2ded98",
|
||||||
"version": "1.84.0",
|
"version": "1.84.0",
|
||||||
|
@ -1010,7 +1010,7 @@
|
|||||||
},
|
},
|
||||||
"boost-modular-build-helper": {
|
"boost-modular-build-helper": {
|
||||||
"baseline": "1.84.0",
|
"baseline": "1.84.0",
|
||||||
"port-version": 1
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"boost-move": {
|
"boost-move": {
|
||||||
"baseline": "1.84.0",
|
"baseline": "1.84.0",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user