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

Specify GIT only when VCPKG_FORCE_SYSTEM_BINARIES is set (#6143)

Browse Source
This commit is contained in:
Hongxu Xu 2019-04-25 07:05:53 +08:00 committed by Curtis J Bezault
parent 95b94ec3b1
commit 48f22127e8
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
toolsrc/src/vcpkg/build.cpp
View File

@ -362,10 +362,8 @@ namespace vcpkg::Build
} }
const Toolset& toolset = paths.get_toolset(pre_build_info); const Toolset& toolset = paths.get_toolset(pre_build_info);
const std::string cmd_launch_cmake = System::make_cmake_cmd(
cmake_exe_path, std::vector<System::CMakeVariable> variables {
paths.ports_cmake,
{
{"CMD", "BUILD"}, {"CMD", "BUILD"},
{"PORT", config.scf.core_paragraph->name}, {"PORT", config.scf.core_paragraph->name},
{"CURRENT_PORT_DIR", config.port_dir}, {"CURRENT_PORT_DIR", config.port_dir},
@ -376,10 +374,19 @@ namespace vcpkg::Build
{"DOWNLOADS", paths.downloads}, {"DOWNLOADS", paths.downloads},
{"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"}, {"_VCPKG_NO_DOWNLOADS", !Util::Enum::to_bool(config.build_package_options.allow_downloads) ? "1" : "0"},
{"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)}, {"_VCPKG_DOWNLOAD_TOOL", to_string(config.build_package_options.download_tool)},
{"GIT", git_exe_path},
{"FEATURES", Strings::join(";", config.feature_list)}, {"FEATURES", Strings::join(";", config.feature_list)},
{"ALL_FEATURES", all_features}, {"ALL_FEATURES", all_features},
}); };
if (!System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value())
{
variables.push_back({"GIT", git_exe_path});
}
const std::string cmd_launch_cmake = System::make_cmake_cmd(
cmake_exe_path,
paths.ports_cmake,
variables);
auto command = make_build_env_cmd(pre_build_info, toolset); auto command = make_build_env_cmd(pre_build_info, toolset);
if (!command.empty()) if (!command.empty())