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

[vcpkg] Prefer the current vcpkg directory over the one the vcpkg.exe is located in

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-10-14 02:07:42 -07:00
parent fc1a24ad8b
commit bf41a93b9d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
toolsrc/src/vcpkg.cpp
View File

@ -73,11 +73,17 @@ static void inner(const VcpkgCmdArguments& args)
vcpkg_root_dir = fs::stdfs::absolute(*v);
}
else
{
const fs::path current_path = fs::stdfs::current_path();
vcpkg_root_dir = Files::get_real_filesystem().find_file_recursively_up(current_path, ".vcpkg-root");
if (vcpkg_root_dir.empty())
{
vcpkg_root_dir = Files::get_real_filesystem().find_file_recursively_up(
fs::stdfs::absolute(System::get_exe_path_of_current_process()), ".vcpkg-root");
}
}
}
Checks::check_exit(VCPKG_LINE_INFO, !vcpkg_root_dir.empty(), "Error: Could not detect vcpkg-root.");
@ -88,6 +94,7 @@ static void inner(const VcpkgCmdArguments& args)
vcpkg_root_dir.string(),
expected_paths.error().message());
const VcpkgPaths paths = expected_paths.value_or_exit(VCPKG_LINE_INFO);
const int exit_code = _wchdir(paths.root.c_str());
Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Changing the working dir failed");
Commands::Version::warn_if_vcpkg_version_mismatch(paths);