Skip to content

[vcpkg CMake] Fix for #18529 that broke iOS compilation#23989

Merged
strega-nil-ms merged 2 commits intomicrosoft:masterfrom
christophe-calmejane:task/fix_iOS
Apr 6, 2022
Merged

[vcpkg CMake] Fix for #18529 that broke iOS compilation#23989
strega-nil-ms merged 2 commits intomicrosoft:masterfrom
christophe-calmejane:task/fix_iOS

Conversation

@christophe-calmejane
Copy link
Contributor

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.

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 --all and committed the result?

Not sure if I need to bump boost-modular-build-helper but probably (tell me)

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.***

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 --all
Diff
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",

@JackBoosY
Copy link
Contributor

I think @strega-nil-ms is more professional than us.

@JackBoosY JackBoosY added category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. labels Apr 6, 2022
@LilyWangLL LilyWangLL changed the title Fix for #18529 that broke iOS compilation [vcpkg CMake] Fix for #18529 that broke iOS compilation Apr 6, 2022
Copy link
Contributor

@strega-nil-ms strega-nil-ms left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! just gonna run for a green :)

@strega-nil-ms
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil-ms strega-nil-ms added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Apr 6, 2022
@strega-nil-ms strega-nil-ms merged commit 436d98d into microsoft:master Apr 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:community-triplet A PR or issue related to community triplets not officially validated by the vcpkg team. category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants