mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmFindBase: skip writing names and *_directories when empty

Browse Source 
When the arrays are empty, the YAML ends up with `foo:` which is
equivalent to `foo: null`, not `foo: []`. Avoid writing the key when it
has no information to provide.
This commit is contained in:
Ben Boeckel
2025-05-13 14:43:08 +02:00
parent 9d41f67319
commit e98381af21
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmFindBase.cxx
View File

@@ -759,14 +759,20 @@ void cmFindBaseDebugState::WriteEvent(cmConfigureLog& log,
!this->FindCommand->NoCMakeInstallPath); !this->FindCommand->NoCMakeInstallPath);
log.EndObject(); log.EndObject();
log.WriteValue("names"_s, this->FindBaseCommand->Names); if (!this->FindBaseCommand->Names.empty()) {
log.WriteValue("names"_s, this->FindBaseCommand->Names);
}
std::vector<std::string> directories; std::vector<std::string> directories;
directories.reserve(this->FailedSearchLocations.size()); directories.reserve(this->FailedSearchLocations.size());
for (auto const& location : this->FailedSearchLocations) { for (auto const& location : this->FailedSearchLocations) {
directories.push_back(location.path); directories.push_back(location.path);
} }
log.WriteValue("candidate_directories"_s, this->FindCommand->SearchPaths); if (!this->FindCommand->SearchPaths.empty()) {
log.WriteValue("searched_directories"_s, directories); log.WriteValue("candidate_directories"_s, this->FindCommand->SearchPaths);
}
if (!directories.empty()) {
log.WriteValue("searched_directories"_s, directories);
}
if (!this->FoundSearchLocation.path.empty()) { if (!this->FoundSearchLocation.path.empty()) {
log.WriteValue("found"_s, this->FoundSearchLocation.path); log.WriteValue("found"_s, this->FoundSearchLocation.path);
} else { } else {