mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-24 15:38:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'find_package-user-dir-not-ignored'

Browse Source 
230e5ec172 find_package: Don't test <name>_DIR against ignored paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9961
This commit is contained in:
Brad King
2024-11-01 13:13:09 +00:00
committed by Kitware Robot
parent a9a7d44a4c 230e5ec172
commit 7b23e2f884
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmFindPackageCommand.cxx
View File

@@ -12,6 +12,7 @@
#include <utility>
#include <cm/optional>
#include <cmext/algorithm>
#include <cmext/string_view>
#include "cmsys/Directory.hxx"
@@ -2422,8 +2423,12 @@ bool cmFindPackageCommand::CheckDirectory(std::string const& dir)
{
assert(!dir.empty() && dir.back() == '/');
// Look for the file in this directory.
std::string const d = dir.substr(0, dir.size() - 1);
if (cm::contains(this->IgnoredPaths, d)) {
return false;
}
// Look for the file in this directory.
if (this->FindConfigFile(d, this->FileFound)) {
// Remove duplicate slashes.
cmSystemTools::ConvertToUnixSlashes(this->FileFound);
@@ -2435,10 +2440,6 @@ bool cmFindPackageCommand::CheckDirectory(std::string const& dir)
bool cmFindPackageCommand::FindConfigFile(std::string const& dir,
std::string& file)
{
if (this->IgnoredPaths.count(dir)) {
return false;
}
for (std::string const& c : this->Configs) {
file = cmStrCat(dir, '/', c);
if (this->DebugMode) {