From de44a808e0adedcf527ac1949b41b37831df69ca Mon Sep 17 00:00:00 2001 From: Vitalii Koshura Date: Fri, 19 Jun 2020 00:53:58 +0200 Subject: [PATCH] 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 --- toolsrc/src/vcpkg/vcpkgpaths.cpp | 4 ++-- 1 file 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(); }