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] Rename the msbuild property VcpkgRoot #11653

Merged
merged 1 commit into from
May 29, 2020

Conversation

BillyONeal
Copy link
Member

… to VcpkgCurrentInstalledDir, and set VcpkgRoot to the expected root instead.

…dDir, and set VcpkgRoot to the expected root instead.
@BillyONeal BillyONeal 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 May 29, 2020
Copy link
Contributor

@strega-nil strega-nil left a comment

Choose a reason for hiding this comment

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

Also, were there really no other uses of VcpkgRoot anywhere?

@@ -61,9 +61,6 @@ namespace vcpkg::Export
{
return Strings::format(R"###(
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a reason we don't have to export this?

Copy link
Member Author

Choose a reason for hiding this comment

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

The file imported is $/scripts/buildsystems/msbuild/vcpkg.targets so the vcpkg root is already known from that. It might be an optimization to set the path here but I don't want to significantly change function if I don't have to.

@strega-nil strega-nil added category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed and removed category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) labels May 29, 2020
@BillyONeal
Copy link
Member Author

Also, were there really no other uses of VcpkgRoot anywhere?

Correct.

@BillyONeal BillyONeal merged commit cc4f93f into microsoft:master May 29, 2020
@BillyONeal BillyONeal deleted the rename_msbuild branch May 29, 2020 23:38
Jinming-Hu added a commit to Jinming-Hu/azure-storage-cpp that referenced this pull request Jun 14, 2020
Jinming-Hu added a commit to Jinming-Hu/azure-storage-cpp that referenced this pull request Jun 14, 2020
Jinming-Hu added a commit to Azure/azure-storage-cpp that referenced this pull request Jun 15, 2020
strega-nil pushed a commit to strega-nil/vcpkg that referenced this pull request May 5, 2021
…dDir, and set VcpkgRoot to the expected root instead. (microsoft#11653)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants