diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-31 17:24:45 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-31 17:35:38 -0700 |
| commit | c84765601bbe49a6ec2e252ec681fe843212230f (patch) | |
| tree | 0a67514bdbff13d6b142d6657c542b62076555ad /toolsrc/src/vcpkg_Environment.cpp | |
| parent | a6aa410f9fb7855b9cc94bae00d15fea8018250e (diff) | |
| download | vcpkg-c84765601bbe49a6ec2e252ec681fe843212230f.tar.gz vcpkg-c84765601bbe49a6ec2e252ec681fe843212230f.zip | |
Move Environment::get_program_files() to System::get_program_files()
Diffstat (limited to 'toolsrc/src/vcpkg_Environment.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_Environment.cpp | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/toolsrc/src/vcpkg_Environment.cpp b/toolsrc/src/vcpkg_Environment.cpp index 01fa6a93c..96482b94b 100644 --- a/toolsrc/src/vcpkg_Environment.cpp +++ b/toolsrc/src/vcpkg_Environment.cpp @@ -137,38 +137,4 @@ namespace vcpkg::Environment static const vcvarsall_and_platform_toolset vcvarsall_bat = find_vcvarsall_bat(paths); return vcvarsall_bat; } - - static const fs::path& get_ProgramFiles() - { - static const fs::path p = System::get_environmental_variable(L"PROGRAMFILES").value_or_exit(VCPKG_LINE_INFO); - return p; - } - - const fs::path& get_ProgramFiles_32_bit() - { - static const fs::path p = []() -> fs::path - { - auto value = System::get_environmental_variable(L"ProgramFiles(x86)"); - if (auto v = value.get()) - { - return std::move(*v); - } - return get_ProgramFiles(); - }(); - return p; - } - - const fs::path& get_ProgramFiles_platform_bitness() - { - static const fs::path p = []() -> fs::path - { - auto value = System::get_environmental_variable(L"ProgramW6432"); - if (auto v = value.get()) - { - return std::move(*v); - } - return get_ProgramFiles(); - }(); - return p; - } } |
