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] Provide $(VcpkgRoot) and $(VcpkgCurrentInstalledDir) for customers. #11779

Merged
merged 1 commit into from
Jun 4, 2020

Conversation

BillyONeal
Copy link
Member

This is a competing resolution with #11772

In 4fb2256#diff-f7a49059a86ff0bb925110f33551a677R57 I removed all uses of $(VcpkgRoot) and $(VcpkgCurrentInstalledDir) because sometimes those properties were passed on the command line or from a user project where they are likely to not have a trailing slash. The intent was to always use VcpkgRootSanitized or similar, which was the same as VcpkgRoot but with a trailing slash added if one was missing from the input. (We could not use the same name because msbuild ignores any modifications of properties set on the command line when msbuild is invoked by default)

This change uses TreatAsLocalProperty to do the add-trailing-slash sanitization, without changing the property name, because it turned out folks were using that property in their own build scripts.

…omers.

This is a competing resolution with microsoft#11772

In microsoft@4fb2256#diff-f7a49059a86ff0bb925110f33551a677R57 I removed all uses of $(VcpkgRoot) and $(VcpkgCurrentInstalledDir) because sometimes those properties were passed on the command line or from a user project where they are likely to not have a trailing slash. The intent was to always use VcpkgRootSanitized or similar, which was the same as VcpkgRoot but with a trailing slash added if one was missing from the input. (We could not use the same name because msbuild ignores any modifications of properties set on the command line when msbuild is invoked by default)

This change uses TreatAsLocalProperty to do the add-trailing-slash sanitization, without changing the property name, because it turned out folks were using that property in their own build scripts.
@BillyONeal BillyONeal added the category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) label Jun 4, 2020
@BillyONeal BillyONeal merged commit 6ac6267 into microsoft:master Jun 4, 2020
@BillyONeal BillyONeal deleted the msbuild_better_properties branch June 4, 2020 20:33
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/`)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants