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

Fix conflict (#36119)

Browse Source
This commit is contained in:
Cheney Wang 2024-01-27 01:43:56 +08:00 committed by GitHub
parent 003a1f0ce7
commit 5786fcb0cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,9 +152,7 @@ function(boost_modular_build)
get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY) get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME}) string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs 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(REGEX REPLACE "-vc14[1-9]-" "-vc140-" NEW_FILENAME ${NEW_FILENAME}) # To merge VS2022 VS2019 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 "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs string(REPLACE "-sgyd-" "-gyd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
string(REPLACE "-gyd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs with python debugging string(REPLACE "-gyd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs with python debugging

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

@ -2,6 +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,
"description": "Internal vcpkg port used to build Boost libraries", "description": "Internal vcpkg port used to build Boost libraries",
"license": "MIT", "license": "MIT",
"dependencies": [ "dependencies": [

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

@ -27,6 +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;
} }
function Get-PortVersion { function Get-PortVersion {

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

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "dc7e88a84383b497c7d9e117a00319fd2b2ded98",
"version": "1.84.0",
"port-version": 1
},
{ {
"git-tree": "846d3e5195faf74db827dd0197a4fbc6a56315bb", "git-tree": "846d3e5195faf74db827dd0197a4fbc6a56315bb",
"version": "1.84.0", "version": "1.84.0",

2
versions/baseline.json
View File

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