Skip to content

[vcpkg.targets] Allow specifying the root for the installed directory #49738

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.

Sign up for GitHub

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

Draft
stinos wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −1
Draft

[vcpkg.targets] Allow specifying the root for the installed directory #49738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/buildsystems/msbuild/vcpkg-general.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@
Description="The location where headers and binaries will be consumed from. In manifest mode, this directory will be created and populated based on vcpkg.json.">
</StringProperty>

<StringProperty Name="VcpkgInstalledDirRoot" DisplayName="Installed Directory Root" Category="General" Subtype="folder" Visible="true"
Description="In manifest mode and when Installed Directory is not defined, the root to derive Installed Directory from for each triplet.">
</StringProperty>

<BoolProperty Name="VcpkgUseStatic" DisplayName="Use Static Libraries" Category="Conditional" Default="false"
Description="Vcpkg can build static libraries (e.g. x64-windows-static). This options changes the default triplet to use these static libraries by appending -static to $(VcpkgTriplet). This will not be shown in the evaluation of the Triplet within the UI." />

Expand Down
8 changes: 7 additions & 1 deletion scripts/buildsystems/msbuild/vcpkg.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@
<_ZVcpkgInstalledDir>$(VcpkgInstalledDir)</_ZVcpkgInstalledDir>
</PropertyGroup>

<PropertyGroup Condition="'$(VcpkgEnableManifest)' == 'true'">
<_ZVcpkgInstalledDirRoot>$(VcpkgInstalledDirRoot)</_ZVcpkgInstalledDirRoot>
<_ZVcpkgInstalledDirRoot Condition="'$(_ZVcpkgInstalledDirRoot)' == ''">$(_ZVcpkgManifestRoot)vcpkg_installed\</_ZVcpkgInstalledDirRoot>
</PropertyGroup>

<!-- Add trailing slashes to inputs that must have them to conform with msbuild conventions. -->
<PropertyGroup>
<_ZVcpkgRoot Condition="!$(_ZVcpkgRoot.EndsWith('\'))">$(_ZVcpkgRoot)\</_ZVcpkgRoot>
<_ZVcpkgManifestRoot Condition="'$(_ZVcpkgManifestRoot)' != '' and !$(_ZVcpkgManifestRoot.EndsWith('\'))">$(_ZVcpkgManifestRoot)\</_ZVcpkgManifestRoot>
<_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' != '' and !$(_ZVcpkgInstalledDir.EndsWith('\'))">$(_ZVcpkgInstalledDir)\</_ZVcpkgInstalledDir>
<_ZVcpkgInstalledDirRoot Condition="'$(_ZVcpkgInstalledDirRoot)' != '' and !$(_ZVcpkgInstalledDirRoot.EndsWith('\'))">$(_ZVcpkgInstalledDirRoot)\</_ZVcpkgInstalledDirRoot>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -76,7 +82,7 @@
<Choose>
<When Condition="'$(VcpkgEnableManifest)' == 'true'">
<PropertyGroup>
<_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgManifestRoot)vcpkg_installed\$(VcpkgTriplet)\</_ZVcpkgInstalledDir>
<_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgInstalledDirRoot)$(VcpkgTriplet)\</_ZVcpkgInstalledDir>
</PropertyGroup>
</When>
<Otherwise>
Expand Down