dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-06-24 08:47:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

find_package: Save package information only after successfully loading it

Browse Source 
If a package configuration file sets `<PackageName>_FOUND` to false,
the package is considered not found.  Do not save its package info.

Note that this exposes an existing pointer invalidation on nested
`find_package` calls, which will be fixed in following commits.

Issue: #27730
This commit is contained in:
Brad King
2026-04-01 11:12:37 -04:00
parent 3a7d797d5b
commit 9387988626
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmFindPackageCommand.cxx
View File

@@ -1668,12 +1668,6 @@ bool cmFindPackageCommand::HandlePackageMode(
"fileFound is true but FileFound is empty!");
fileFound = false;
}
if (fileFound) {
this->CurrentPackageInfo->Directory =
cmSystemTools::GetFilenamePath(this->FileFound);
this->CurrentPackageInfo->Version = this->VersionFound;
}
}
std::string const foundVar = cmStrCat(this->Name, "_FOUND");
@@ -1735,6 +1729,12 @@ bool cmFindPackageCommand::HandlePackageMode(
// The configuration file is invalid.
result = false;
}
if (this->UseConfigFiles && found) {
this->CurrentPackageInfo->Directory =
cmSystemTools::GetFilenamePath(this->FileFound);
this->CurrentPackageInfo->Version = this->VersionFound;
}
}
if (this->UseFindModules && !found &&