diff options
| author | Vitalii Koshura <lestat.de.lionkur@gmail.com> | 2020-06-19 00:53:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 15:53:58 -0700 |
| commit | de44a808e0adedcf527ac1949b41b37831df69ca (patch) | |
| tree | 89c45efc44bf762464cfecd5009a1ef7093d5da8 | |
| parent | 55e96af16b200ef165038b2ce582867d777712eb (diff) | |
| download | vcpkg-de44a808e0adedcf527ac1949b41b37831df69ca.tar.gz vcpkg-de44a808e0adedcf527ac1949b41b37831df69ca.zip | |
Put user-defined configuration triplets path on top of the search queue (#11931)
I believe that user-defined configuration triplets paths should be the first when searching for triplet configuration.
This commit puts user-defined configuration triplets (if defined) on top of the search queue before standard paths.
This could help to overwrite default tiplet configuration without setting custom triplet.
P.S. If current implementation is better than my suggestion, feel free to ignore this commit.
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
| -rw-r--r-- | toolsrc/src/vcpkg/vcpkgpaths.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index ffc58b637..0219627c4 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -128,8 +128,6 @@ namespace vcpkg ports_cmake = filesystem.canonical(VCPKG_LINE_INFO, scripts / fs::u8path("ports.cmake")); - triplets_dirs.emplace_back(triplets); - triplets_dirs.emplace_back(community_triplets); if (args.overlay_triplets) { for (auto&& overlay_triplets_dir : *args.overlay_triplets) @@ -137,6 +135,8 @@ namespace vcpkg triplets_dirs.emplace_back(filesystem.canonical(VCPKG_LINE_INFO, fs::u8path(overlay_triplets_dir))); } } + triplets_dirs.emplace_back(triplets); + triplets_dirs.emplace_back(community_triplets); } fs::path VcpkgPaths::package_dir(const PackageSpec& spec) const { return this->packages / spec.dir(); } |