mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 00:39:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Naming convention

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-08-31 18:02:51 -07:00
parent d86d9727f6
commit 72394491b2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/include/vcpkg_System.h
View File

@ -82,7 +82,7 @@ namespace vcpkg::System
const fs::path& get_program_files_32_bit();
const fs::path& get_ProgramFiles_platform_bitness();
const fs::path& get_program_files_platform_bitness();
}
namespace vcpkg::Debug

4
toolsrc/src/VcpkgPaths.cpp
View File

@ -115,7 +115,7 @@ 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(System::get_ProgramFiles_platform_bitness() / "CMake" / "bin" / "cmake.exe");
candidate_paths.push_back(System::get_program_files_platform_bitness() / "CMake" / "bin" / "cmake.exe");
candidate_paths.push_back(System::get_program_files_32_bit() / "CMake" / "bin");
const Optional<fs::path> path =
@ -160,7 +160,7 @@ 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(System::get_ProgramFiles_platform_bitness() / "git" / "cmd" / "git.exe");
candidate_paths.push_back(System::get_program_files_platform_bitness() / "git" / "cmd" / "git.exe");
candidate_paths.push_back(System::get_program_files_32_bit() / "git" / "cmd" / "git.exe");
const Optional<fs::path> path =

2
toolsrc/src/commands_edit.cpp
View File

@ -48,7 +48,7 @@ namespace vcpkg::Commands::Edit
std::vector<fs::path> candidate_paths;
const std::vector<fs::path> from_path = Files::find_from_PATH(L"EDITOR");
candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend());
candidate_paths.push_back(System::get_ProgramFiles_platform_bitness() / "Microsoft VS Code" / "Code.exe");
candidate_paths.push_back(System::get_program_files_platform_bitness() / "Microsoft VS Code" / "Code.exe");
candidate_paths.push_back(System::get_program_files_32_bit() / "Microsoft VS Code" / "Code.exe");
const std::vector<fs::path> from_registry = find_from_registry();

2
toolsrc/src/vcpkg_System.cpp
View File

@ -302,7 +302,7 @@ namespace vcpkg::System
return PATH;
}
const fs::path& get_ProgramFiles_platform_bitness()
const fs::path& get_program_files_platform_bitness()
{
static const fs::path PATH = []() -> fs::path {
auto value = System::get_environment_variable(L"ProgramW6432");