diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-05-08 12:41:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 12:41:44 -0700 |
| commit | 8de3f323dcf60790bf049284b9b7d7232a87984d (patch) | |
| tree | 3ad60649f9311528d646a37a550ac6efafeddf17 /toolsrc/include | |
| parent | 62d5125c5d11053af60bbb1e461c50be3b080c9f (diff) | |
| download | vcpkg-8de3f323dcf60790bf049284b9b7d7232a87984d.tar.gz vcpkg-8de3f323dcf60790bf049284b9b7d7232a87984d.zip | |
[vcpkg] Resolve relative overlay ports to the current working directory. (#11233)
Fixes #10771.
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/vcpkgpaths.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h index c95515aee..2588abf4d 100644 --- a/toolsrc/include/vcpkg/vcpkgpaths.h +++ b/toolsrc/include/vcpkg/vcpkgpaths.h @@ -61,7 +61,8 @@ namespace vcpkg const Optional<fs::path>& install_root_dir, const Optional<fs::path>& vcpkg_scripts_root_dir, const std::string& default_vs_path, - const std::vector<std::string>* triplets_dirs); + const std::vector<std::string>* triplets_dirs, + fs::path original_cwd); fs::path package_dir(const PackageSpec& spec) const; fs::path build_info_file_path(const PackageSpec& spec) const; @@ -72,6 +73,7 @@ namespace vcpkg const std::vector<TripletFile>& get_available_triplets() const; const fs::path get_triplet_file_path(Triplet triplet) const; + fs::path original_cwd; fs::path root; fs::path packages; fs::path buildtrees; |