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

[boost] Fix boost-modular-build.cmake with VS 2022 17.0 Preview 2 (#19086)

Browse Source 
* Fix boost-modular-build.cmake with VS 2022 17.0 Preview 2.

* Update another version list, noticed by @CaseyCarter.

* Update port-version to 1.

* Run `vcpkg.exe x-add-version --all`.
This commit is contained in:
Stephan T. Lavavej 2021-07-23 21:05:45 -07:00 committed by GitHub
parent f7c83acf48
commit 134505003b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,10 @@ function(boost_modular_build)
endif()
set(MSVC_VERSION)
if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
if(VCPKG_PLATFORM_TOOLSET MATCHES "v143")
list(APPEND _bm_OPTIONS toolset=msvc)
set(MSVC_VERSION 14.3)
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
list(APPEND _bm_OPTIONS toolset=msvc)
set(MSVC_VERSION 14.2)
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
@ -410,6 +413,7 @@ function(boost_modular_build)
string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
string(REPLACE "-vc141-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2017 and VS2015 binaries
string(REPLACE "-vc142-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2019 and VS2015 binaries
string(REPLACE "-vc143-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 and VS2015 binaries
string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
string(REPLACE "-x32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries

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

@ -1,6 +1,7 @@
{
"name": "boost-modular-build-helper",
"version-string": "1.76.0",
"port-version": 1,
"dependencies": [
"boost-build",
"boost-uninstall"

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

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f9cf6243049bf0abf8526fba57702a2122665549",
"version-string": "1.76.0",
"port-version": 1
},
{
"git-tree": "e0f858222eaf2c58a7270d10d649bc88e2e149b6",
"version-string": "1.76.0",

2
versions/baseline.json
View File

@ -746,7 +746,7 @@
},
"boost-modular-build-helper": {
"baseline": "1.76.0",
"port-version": 0
"port-version": 1
},
"boost-move": {
"baseline": "1.76.0",