mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 22:30:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmFindPackage: fix over-reporting

Browse Source 
Both track when a `_DIR` variable is already defined and suppress
implicit event reporting when a mode that has no reliable method for
such detection.
This commit is contained in:
Ben Boeckel
2025-05-20 20:42:20 +02:00
parent 8b3fc9578a
commit 0e53a67a7b
15 changed files with 1131 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmFindPackageCommand.cxx
+52 -6
View File
@@ -614,15 +614,13 @@ void cmFindPackageCommand::InheritOptions(cmFindPackageCommand* other)
bool cmFindPackageCommand::IsFound() const
{
return !this->FileFound.empty();
return this->InitialState == FindState::Found;
}
bool cmFindPackageCommand::IsDefined() const
{
// A `find_package` always needs to be rerun because it could create
// variables, provide commands, or targets. Therefore it is never
// "predefined" whether it is found or not.
return false;
return this->InitialState == FindState::Found ||
this->InitialState == FindState::NotFound;
}
bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
@@ -933,6 +931,41 @@ bool cmFindPackageCommand::InitialPass(std::vector<std::string> const& args)
return false;
}
bool canBeIrrelevant = true;
if (this->UseConfigFiles || this->UseCpsFiles) {
canBeIrrelevant = false;
if (cmValue v = this->Makefile->GetState()->GetCacheEntryValue(
cmStrCat(this->Name, "_DIR"))) {
if (!v.IsNOTFOUND()) {
this->InitialState = FindState::Found;
} else {
this->InitialState = FindState::NotFound;
}
}
}
if (this->UseFindModules &&
(this->InitialState == FindState::Undefined ||
this->InitialState == FindState::NotFound)) {
// There are no definitive cache variables to know if a given `Find` module
// has been searched for or not. However, if we have a `_FOUND` variable,
// use that as an indication of a previous search.
if (cmValue v =
this->Makefile->GetDefinition(cmStrCat(this->Name, "_FOUND"))) {
if (v.IsOn()) {
this->InitialState = FindState::Found;
} else {
this->InitialState = FindState::NotFound;
}
}
}
// If there is no signaling variable and there's no reason to expect a cache
// variable, mark the initial state as "irrelevant".
if (this->InitialState == FindState::Undefined && canBeIrrelevant) {
this->InitialState = FindState::Irrelevant;
}
// Ignore EXACT with no version.
if (this->VersionComplete.empty() && this->VersionExact) {
this->VersionExact = false;
@@ -3477,6 +3510,19 @@ void cmFindPackageDebugState::FailedAtImpl(std::string const& path,
(void)regexName;
}
bool cmFindPackageDebugState::ShouldImplicitlyLogEvents() const
{
auto const* fpc = this->FindPackageCommand;
bool const canUsePackage = fpc->UseConfigFiles || fpc->UseCpsFiles;
return canUsePackage &&
fpc->FileFoundMode != cmFindPackageCommand::FoundPackageMode::Module &&
std::any_of(fpc->ConsideredPaths.begin(), fpc->ConsideredPaths.end(),
[](cmFindPackageCommand::ConsideredPath const& cp) {
return cp.Mode >
cmFindPackageCommand::FoundPackageMode::Module;
});
}
void cmFindPackageDebugState::WriteDebug() const
{
}
@@ -3677,7 +3723,7 @@ void cmFindPackageDebugState::WriteEvent(cmConfigureLog& log,
log.EndObject();
}
// TODO: Add provider information (see #26925)
if (fpc->IsFound()) {
if (!fpc->FileFound.empty()) {
log.BeginObject("found"_s);
log.WriteValue("path"_s, fpc->FileFound);
log.WriteValue("mode"_s, found_mode(fpc->FileFoundMode));