[vcpkg CMake] Fix for #18529 that broke iOS compilation#23989
Merged
strega-nil-ms merged 2 commits intomicrosoft:masterfrom Apr 6, 2022
Merged
[vcpkg CMake] Fix for #18529 that broke iOS compilation#23989strega-nil-ms merged 2 commits intomicrosoft:masterfrom
strega-nil-ms merged 2 commits intomicrosoft:masterfrom
Conversation
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
PRs must add only one version and must not modify any published versions
When making any changes to a library, the version or port-version in vcpkg.json or CONTROL must be modified.
Error: Local changes detected for vcpkg-cmake but no changes to version or port version.
-- Version: 2022-02-14
-- Old SHA: bdfdf28cf28bc07d02af864315ca291dcfae180b
-- New SHA: 910dd95c53354181c5c1a3c5f57c57f7b81ffc9f
-- Did you remember to update the version or port version?
-- Pass `--overwrite-version` to bypass this check.
***No files were updated.***
a614a5d to
99b82f8
Compare
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 01d6f6ff1e5332b926099f0c23bda996940ad4e8 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/baseline.json b/versions/baseline.json
index 9b5c105..69dca6b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7261,7 +7261,7 @@
"port-version": 1
},
"vcpkg-cmake": {
- "baseline": "2022-02-14",
+ "baseline": "2022-04-05",
"port-version": 0
},
"vcpkg-cmake-config": {
diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json
index 56a6f59..a5fd961 100644
--- a/versions/v-/vcpkg-cmake.json
+++ b/versions/v-/vcpkg-cmake.json
@@ -1,5 +1,10 @@
{
"versions": [
+ {
+ "git-tree": "34d8604d164edd2903bdb833adf30fe1516c9982",
+ "version-date": "2022-04-05",
+ "port-version": 0
+ },
{
"git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b",
"version-date": "2022-02-14",
Contributor
|
I think @strega-nil-ms is more professional than us. |
strega-nil-ms
approved these changes
Apr 6, 2022
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Describe the pull request
Fix for iOS compilation (boost port mainly).
Thank to #23001 (from which this fix is based on), this PR should also fix more broken iOS ports.
What does your PR fix?
Fixes broken [boost-modular-build-helper] Fix boost build toolchain options not being used #18529
Which triplets are supported/not supported? Have you updated the CI baseline?
macOS and iOS
Does your PR follow the maintainer guide?
Yes
If you have added/updated a port: Have you run
./vcpkg x-add-version --alland committed the result?Not sure if I need to bump
boost-modular-build-helperbut probably (tell me)