3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-17 06:28:17 +08:00
Code Issues Projects Releases Wiki Activity

Throw error is PROGRAMFILES env variable is not found

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-02-24 14:44:37 -08:00
parent 60e67651c3
commit 95a9a98ede
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolsrc/src/vcpkg_Environment.cpp
View File

@ -231,6 +231,19 @@ namespace vcpkg::Environment
return vcvarsall_bat; return vcvarsall_bat;
} }
static fs::path find_ProgramFiles()
{
const optional<std::wstring> program_files = System::get_environmental_variable(L"PROGRAMFILES");
Checks::check_exit(program_files.get() != nullptr, "Could not detect the PROGRAMFILES environmental variable");
return *program_files;
}
static const fs::path& get_ProgramFiles()
{
static const fs::path p = find_ProgramFiles();
return p;
}
static fs::path find_ProgramFiles_32_bit() static fs::path find_ProgramFiles_32_bit()
{ {
const optional<std::wstring> program_files_X86 = System::get_environmental_variable(L"ProgramFiles(x86)"); const optional<std::wstring> program_files_X86 = System::get_environmental_variable(L"ProgramFiles(x86)");
@ -239,7 +252,7 @@ namespace vcpkg::Environment
return *program_files_X86; return *program_files_X86;
} }
return *System::get_environmental_variable(L"PROGRAMFILES"); return get_ProgramFiles();
} }
const fs::path& get_ProgramFiles_32_bit() const fs::path& get_ProgramFiles_32_bit()
@ -256,7 +269,7 @@ namespace vcpkg::Environment
return *program_files_W6432; return *program_files_W6432;
} }
return *System::get_environmental_variable(L"PROGRAMFILES"); return get_ProgramFiles();
} }
const fs::path& get_ProgramFiles_platform_bitness() const fs::path& get_ProgramFiles_platform_bitness()