diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2021-02-09 15:35:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 15:35:06 -0800 |
| commit | 4502f8ed6874fa29a54e1a1a49d32bcf1cb5fddf (patch) | |
| tree | 0e153a3b4a5f10511e7e8d266057492e4ec9d273 /scripts | |
| parent | 6195f2ae7e1744ccd506506731b8344c4cad79d0 (diff) | |
| download | vcpkg-4502f8ed6874fa29a54e1a1a49d32bcf1cb5fddf.tar.gz vcpkg-4502f8ed6874fa29a54e1a1a49d32bcf1cb5fddf.zip | |
[vcpkg.targets] Add an additional options parameter for MSBuild integration (#16155)
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg-general.xml | 3 | ||||
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg-general.xml b/scripts/buildsystems/msbuild/vcpkg-general.xml index 0fbe3c6ab..0c32c4a84 100644 --- a/scripts/buildsystems/msbuild/vcpkg-general.xml +++ b/scripts/buildsystems/msbuild/vcpkg-general.xml @@ -68,6 +68,9 @@ <StringProperty Name="VcpkgTriplet" DisplayName="Triplet" Category="Conditional" Subtype="Text" Description="Specifies the triplet used by Vcpkg. Does not include the '-static' suffix that may be added by the 'Use static libraries' flag." /> + <StringProperty Name="VcpkgAdditionalInstallOptions" DisplayName="Additional Options" Category="General" Subtype="Text" + Description="Additional command line options to be passed to the underlying vcpkg tool when installing in manifest mode." /> + <EnumProperty Name="VcpkgConfiguration" DisplayName="Vcpkg Configuration" Category="Conditional" Description="Specifies if release or debug libraries build with vcpkg should be used."> <EnumValue Name="Release" Description="Uses release libraries" /> diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 5f22d0fe5..196e52ddc 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -84,7 +84,7 @@ <_VcpkgItemToDelete Include="$(TLogLocation)VcpkgInstallManifest*.read.1u.tlog" /> </ItemGroup> <Delete Files="@(_VcpkgItemToDelete)" /> - <Exec Command="%22$([System.IO.Path]::Combine($(VcpkgRoot), 'vcpkg.exe'))%22 install --x-wait-for-lock --triplet %22$(VcpkgTriplet)%22 --vcpkg-root %22$(VcpkgRoot)\%22 %22--x-manifest-root=$(VcpkgManifestRoot)\%22 %22--x-install-root=$(VcpkgInstalledDir)\%22" + <Exec Command="%22$([System.IO.Path]::Combine($(VcpkgRoot), 'vcpkg.exe'))%22 install --x-wait-for-lock --triplet %22$(VcpkgTriplet)%22 --vcpkg-root %22$(VcpkgRoot)\%22 %22--x-manifest-root=$(VcpkgManifestRoot)\%22 %22--x-install-root=$(VcpkgInstalledDir)\%22 $(VcpkgAdditionalInstallOptions)" StandardOutputImportance="High" /> <WriteLinesToFile File="$(TLogLocation)VcpkgInstallManifest$(VcpkgTriplet).read.1u.tlog" Lines="@(_VcpkgInstallManifestDependenciesInputs -> '^%(Identity)')" |