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_paths.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_paths.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_paths.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/toolsrc/src/vcpkg_paths.cpp b/toolsrc/src/vcpkg_paths.cpp index 86106028a..2cbd6602e 100644 --- a/toolsrc/src/vcpkg_paths.cpp +++ b/toolsrc/src/vcpkg_paths.cpp @@ -1,5 +1,5 @@ #include "pch.h" -#include "expected.h" +#include "vcpkg_expected.h" #include "vcpkg_paths.h" #include "metrics.h" #include "vcpkg_System.h" @@ -98,8 +98,8 @@ namespace vcpkg std::vector<fs::path> candidate_paths; candidate_paths.push_back(downloaded_copy); candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); - candidate_paths.push_back(Environment::get_ProgramFiles_platform_bitness() / "CMake" / "bin" / "cmake.exe"); - candidate_paths.push_back(Environment::get_ProgramFiles_32_bit() / "CMake" / "bin"); + candidate_paths.push_back(System::get_ProgramFiles_platform_bitness() / "CMake" / "bin" / "cmake.exe"); + candidate_paths.push_back(System::get_ProgramFiles_32_bit() / "CMake" / "bin"); const optional<fs::path> path = find_if_has_equal_or_greater_version(candidate_paths, version_check_arguments, expected_version); if (auto p = path.get()) @@ -142,8 +142,8 @@ namespace vcpkg std::vector<fs::path> candidate_paths; candidate_paths.push_back(downloaded_copy); candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); - candidate_paths.push_back(Environment::get_ProgramFiles_platform_bitness() / "git" / "cmd" / "git.exe"); - candidate_paths.push_back(Environment::get_ProgramFiles_32_bit() / "git" / "cmd" / "git.exe"); + candidate_paths.push_back(System::get_ProgramFiles_platform_bitness() / "git" / "cmd" / "git.exe"); + candidate_paths.push_back(System::get_ProgramFiles_32_bit() / "git" / "cmd" / "git.exe"); const optional<fs::path> path = find_if_has_equal_or_greater_version(candidate_paths, version_check_arguments, expected_version); if (auto p = path.get()) |