diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-09-18 17:01:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 17:01:18 -0700 |
| commit | 4902a7be1db3cf98ada0c09e54a430d06a900a18 (patch) | |
| tree | c36691dfcb4d780bfa9e830e80bd23e2ff3e3ac0 /scripts | |
| parent | 9b89e93f2cce884e6fd3574829357b5ff4acdb88 (diff) | |
| download | vcpkg-4902a7be1db3cf98ada0c09e54a430d06a900a18.tar.gz vcpkg-4902a7be1db3cf98ada0c09e54a430d06a900a18.zip | |
[vcpkg manifest-mode] Fix parallel msbuild failures (#13589)
This changes the vcpkg msbuild targets file to wait for the lock, rather than failing immediately
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index c43837e53..a9c339559 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -99,7 +99,7 @@ <Target Name="VcpkgInstallManifestDependencies" Condition="'$(VcpkgEnabled)' == 'true' and '$(VcpkgEnableManifest)' == 'true' and '$(VcpkgManifestInstall)' == 'true'" BeforeTargets="ClCompile"> <Message Text="Installing vcpkg dependencies" Importance="High" /> - <Exec Command="%22$(VcpkgRoot)vcpkg.exe%22 install --triplet %22$(VcpkgTriplet)%22 --vcpkg-root %22$(VcpkgRoot)\%22 %22--x-manifest-root=$(VcpkgManifestRoot)\%22 %22--x-install-root=$(VcpkgInstalledDir)\%22 --binarycaching" StandardOutputImportance="High" /> + <Exec Command="%22$(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" StandardOutputImportance="High" /> </Target> <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup;RegisterOutput" Condition="'$(VcpkgEnabled)' == 'true' and '$(VcpkgApplocalDeps)' == 'true'"> |