mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 11:42:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve error message when PROGRAMFILES is not found

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-03-21 16:19:06 -07:00
parent 9a0b2d19e3
commit 1baa7f1642
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
toolsrc/src/vcpkg/base/system.cpp
View File

@ -533,7 +533,15 @@ namespace vcpkg::System
static const fs::path& get_program_files() static const fs::path& get_program_files()
{ {
static const fs::path PATH = System::get_environment_variable("PROGRAMFILES").value_or_exit(VCPKG_LINE_INFO); static const fs::path PATH = []() -> fs::path {
auto value = System::get_environment_variable("PROGRAMFILES");
if (auto v = value.get())
{
return *v;
}
Checks::exit_with_message(VCPKG_LINE_INFO, "Could not find PROGRAMFILES environment variable");
}();
return PATH; return PATH;
} }
@ -543,7 +551,7 @@ namespace vcpkg::System
auto value = System::get_environment_variable("ProgramFiles(x86)"); auto value = System::get_environment_variable("ProgramFiles(x86)");
if (auto v = value.get()) if (auto v = value.get())
{ {
return std::move(*v); return *v;
} }
return get_program_files(); return get_program_files();
}(); }();
@ -556,7 +564,7 @@ namespace vcpkg::System
auto value = System::get_environment_variable("ProgramW6432"); auto value = System::get_environment_variable("ProgramW6432");
if (auto v = value.get()) if (auto v = value.get())
{ {
return std::move(*v); return *v;
} }
return get_program_files(); return get_program_files();
}(); }();