diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2021-06-05 09:45:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-05 09:45:39 -0700 |
| commit | b2544fd780b2e9a05d903314cbbd37268ba43d81 (patch) | |
| tree | dcbd6166db654b1526c820fc289dba2f6c3f7d48 /scripts | |
| parent | 751fc199af8d33eb300af5edbd9e3b77c48f0bca (diff) | |
| download | vcpkg-b2544fd780b2e9a05d903314cbbd37268ba43d81.tar.gz vcpkg-b2544fd780b2e9a05d903314cbbd37268ba43d81.zip | |
[vcpkg_download_distfile] fix download while in manifest mode (#18283)
When vcpkg detects a manifest root, it attempts to take a filesystem lock;
this is a bug in `x-download`.
We fix this bug by disabling manifests.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_download_distfile.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake index 5af4345ba..dd5108f92 100644 --- a/scripts/cmake/vcpkg_download_distfile.cmake +++ b/scripts/cmake/vcpkg_download_distfile.cmake @@ -202,7 +202,13 @@ function(vcpkg_download_distfile VAR) endforeach() endif() vcpkg_execute_in_download_mode( - COMMAND "$ENV{VCPKG_COMMAND}" x-download "${downloaded_file_path}" "${vcpkg_download_distfile_SHA512}" ${urls} ${request_headers} --debug + COMMAND "$ENV{VCPKG_COMMAND}" x-download + "${downloaded_file_path}" + "${vcpkg_download_distfile_SHA512}" + ${urls} + ${request_headers} + --debug + --feature-flags=-manifests # there's a bug in vcpkg x-download when it finds a manifest-root OUTPUT_VARIABLE output ERROR_VARIABLE output RESULT_VARIABLE failure |