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

Fix #ifdef'ed references to get_tool_exe()

Browse Source
This commit is contained in:
Alexander Karatarakis 2018-04-04 20:47:58 -07:00
parent 408cd5ccb8
commit 540ab52789
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,7 +338,7 @@ namespace vcpkg::Build
#if !defined(_WIN32) #if !defined(_WIN32)
// TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107. // TODO: remove when vcpkg.exe is in charge for acquiring tools. Change introduced in vcpkg v0.0.107.
// bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted. // bootstrap should have already downloaded ninja, but making sure it is present in case it was deleted.
vcpkg::Util::unused(paths.get_ninja_exe()); vcpkg::Util::unused(paths.get_tool_exe(Tools::NINJA));
#endif #endif
const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE); const fs::path& cmake_exe_path = paths.get_tool_exe(Tools::CMAKE);

2
toolsrc/src/vcpkg/commands.hash.cpp
View File

@ -112,7 +112,7 @@ namespace vcpkg::Commands::Hash
{ {
const std::string cmd_line = Strings::format( const std::string cmd_line = Strings::format(
R"("%s" -E %ssum "%s")", R"("%s" -E %ssum "%s")",
paths.get_cmake_exe().u8string(), paths.get_tool_exe(Tools::CMAKE).u8string(),
Strings::ascii_to_lowercase(hash_type), Strings::ascii_to_lowercase(hash_type),
path.u8string()); path.u8string());