[vcpkg-cmake-config] fix up cmake_current_packages_dir#20439
Merged
BillyONeal merged 19 commits intomicrosoft:masterfrom Dec 9, 2021
Merged
[vcpkg-cmake-config] fix up cmake_current_packages_dir#20439BillyONeal merged 19 commits intomicrosoft:masterfrom
BillyONeal merged 19 commits intomicrosoft:masterfrom
Conversation
JackBoosY
approved these changes
Sep 30, 2021
JackBoosY
reviewed
Sep 30, 2021
Neumann-A
reviewed
Oct 18, 2021
JackBoosY
suggested changes
Oct 19, 2021
JackBoosY
suggested changes
Oct 19, 2021
JackBoosY
approved these changes
Oct 19, 2021
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 078f3e51efd5ea6072d0ba28d11baa946519a2ce -- versions
./vcpkg x-add-version --allDiff
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
},
Member
Unfortunately I don't feel super well qualified on this one and would like @ras0219 / @ras0219-msft to look again. I poked him. |
ras0219-msft
requested changes
Nov 29, 2021
Contributor
Author
|
Depends on #21825 |
ras0219-msft
approved these changes
Dec 3, 2021
Contributor
|
Depends on #21825. |
BillyONeal
reviewed
Dec 7, 2021
Member
BillyONeal
left a comment
There was a problem hiding this comment.
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.
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 1b664707c109f5d48b0b142e96117a53deb653be -- versions
./vcpkg x-add-version --allDiff
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
},
Closed
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.
Fixes #20422
Another issue, we can't replace cmake_current_packages_dir to _IMPORT_PREFIX for these special cases:
libzen
cjson
openmvs