diff options
| author | Billy O'Neal <bion@microsoft.com> | 2021-02-03 11:11:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 11:11:27 -0800 |
| commit | ba03ad7c9d2f3b0467229055bebf5b7251f15045 (patch) | |
| tree | 2296cc734c7f2667910d81455dce5fe4780a2778 /toolsrc/src/vcpkg.cpp | |
| parent | dc4d1b735aca2aa3ef0582ab2e420031fd24a402 (diff) | |
| download | vcpkg-ba03ad7c9d2f3b0467229055bebf5b7251f15045.tar.gz vcpkg-ba03ad7c9d2f3b0467229055bebf5b7251f15045.zip | |
[vcpkg] Apply fixes needed to extract vcpkg-tool (#16012)
utilities.cmake: Disable warnings that are firing on Azure Pipelines CI machines due to different Clang version.
expected.h: Fix a bug I introduced in https://github.com/microsoft/vcpkg/pull/15638/ because I was under the impression expected worked like optional (in that value_or_exit for it should be treated as a program bug)
build.cpp: Add (void)s to silence warnings.
binarycaching.cpp: Repair assumption that the current directory is C: which isn't true on the Hosted Azure Pipelines agents.
others: Make unit tests respect %VCPKG_ROOT%, as necessary in the vcpkg_tool repo. Note that this required splitting vcpkgcmdarguments::ImbueFromEnvironment into the once-only process modifying part and the just imbue from environment part.
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index ccc951f10..f25a0c3b6 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -226,6 +226,7 @@ int main(const int argc, const char* const* const argv) VcpkgCmdArguments args = VcpkgCmdArguments::create_from_command_line(fs, argc, argv); if (const auto p = args.debug.get()) Debug::g_debugging = *p; args.imbue_from_environment(); + VcpkgCmdArguments::imbue_or_apply_process_recursion(args); args.check_feature_flag_consistency(); { |