Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg-cmake-config] fix up cmake_current_packages_dir #20439

Merged
merged 19 commits into from
Dec 9, 2021

Conversation

PhoebeHui
Copy link
Contributor

Fixes #20422

Another issue, we can't replace cmake_current_packages_dir to _IMPORT_PREFIX for these special cases:

libzen
cjson
openmvs

@PhoebeHui PhoebeHui added category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) info:internal This PR or Issue was filed by the vcpkg team. labels Sep 30, 2021
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 078f3e51efd5ea6072d0ba28d11baa946519a2ce -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json
index 6b5d678..59248cc 100644
--- a/versions/v-/vcpkg-cmake-config.json
+++ b/versions/v-/vcpkg-cmake-config.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "34d05637b537f2a7b665f767123c17823bc796aa",
+      "git-tree": "8a029a9c4c967f29abe2f3dd13f8bc47a62b396f",
       "version-date": "2021-09-29",
       "port-version": 0
     },

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Oct 21, 2021
@BillyONeal
Copy link
Member

Ping @BillyONeal for review this again.

Unfortunately I don't feel super well qualified on this one and would like @ras0219 / @ras0219-msft to look again. I poked him.

@BillyONeal BillyONeal added requires:author-response and removed info:reviewed Pull Request changes follow basic guidelines labels Nov 29, 2021
@PhoebeHui
Copy link
Contributor Author

Depends on #21825

@JackBoosY
Copy link
Contributor

Depends on #21825.

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Dec 6, 2021
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

I asked for some help to double check this.

…longer relevant, fix spelling errors, and avoid calculating relative paths for the definition of VCPKG_IMPORT_PREFIX when not used.
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 1b664707c109f5d48b0b142e96117a53deb653be -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json
index 37315f7b..dda29410 100644
--- a/versions/v-/vcpkg-cmake-config.json
+++ b/versions/v-/vcpkg-cmake-config.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "121e4c0087cf79386b2e23ffb2ee009995fea067",
+      "git-tree": "51df1bbddb22782b9e7f23f9b3588674184e991a",
       "version-date": "2021-12-01",
       "port-version": 0
     },

Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

Looks great, thank you!

@BillyONeal BillyONeal merged commit 77967a6 into microsoft:master Dec 9, 2021
@Blakjak88 Blakjak88 mentioned this pull request Dec 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot use cjson with cmake
9 participants