3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 11:41:36 +08:00
Code Issues Projects Releases Wiki Activity

Function naming convention

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

2
toolsrc/include/vcpkg_System.h
View File

@ -80,7 +80,7 @@ namespace vcpkg::System
std::vector<CPUArchitecture> get_supported_host_architectures();
const fs::path& get_ProgramFiles_32_bit();
const fs::path& get_program_files_32_bit();
const fs::path& get_ProgramFiles_platform_bitness();
}

4
toolsrc/src/VcpkgPaths.cpp
View File

@ -116,7 +116,7 @@ namespace vcpkg
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_ProgramFiles_32_bit() / "CMake" / "bin");
candidate_paths.push_back(System::get_program_files_32_bit() / "CMake" / "bin");
const Optional<fs::path> path =
find_if_has_equal_or_greater_version(candidate_paths, version_check_arguments, expected_version);
@ -161,7 +161,7 @@ namespace vcpkg
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_ProgramFiles_32_bit() / "git" / "cmd" / "git.exe");
candidate_paths.push_back(System::get_program_files_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);

2
toolsrc/src/commands_edit.cpp
View File

@ -49,7 +49,7 @@ namespace vcpkg::Commands::Edit
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_ProgramFiles_32_bit() / "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();
candidate_paths.insert(candidate_paths.end(), from_registry.cbegin(), from_registry.cend());

6
toolsrc/src/commands_integrate.cpp
View File

@ -9,10 +9,10 @@
namespace vcpkg::Commands::Integrate
{
static const std::array<fs::path, 2> old_system_target_files = {
System::get_ProgramFiles_32_bit() / "MSBuild/14.0/Microsoft.Common.Targets/ImportBefore/vcpkg.nuget.targets",
System::get_ProgramFiles_32_bit() / "MSBuild/14.0/Microsoft.Common.Targets/ImportBefore/vcpkg.system.targets"};
System::get_program_files_32_bit() / "MSBuild/14.0/Microsoft.Common.Targets/ImportBefore/vcpkg.nuget.targets",
System::get_program_files_32_bit() / "MSBuild/14.0/Microsoft.Common.Targets/ImportBefore/vcpkg.system.targets"};
static const fs::path system_wide_targets_file =
System::get_ProgramFiles_32_bit() / "MSBuild/Microsoft.Cpp/v4.0/V140/ImportBefore/Default/vcpkg.system.props";
System::get_program_files_32_bit() / "MSBuild/Microsoft.Cpp/v4.0/V140/ImportBefore/Default/vcpkg.system.props";
static std::string create_appdata_targets_shortcut(const std::string& target_path) noexcept
{

2
toolsrc/src/vcpkg_System.cpp
View File

@ -289,7 +289,7 @@ namespace vcpkg::System
return PATH;
}
const fs::path& get_ProgramFiles_32_bit()
const fs::path& get_program_files_32_bit()
{
static const fs::path PATH = []() -> fs::path {
auto value = System::get_environment_variable(L"ProgramFiles(x86)");