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

Merge topic 'organize_makefile_help_output'

Browse Source 
7c1470f146 Makefiles: Organize help output to group 'like' targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4260
This commit is contained in:
Kyle Edwards
2020-01-23 15:42:55 +00:00
committed by Kitware Robot
parent b74ed6fcf3 7c1470f146
commit ab2fc91821
1 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@@ -892,6 +892,9 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule(
// Keep track of targets already listed.
std::set<std::string> emittedTargets;
std::set<std::string> utility_targets;
std::set<std::string> globals_targets;
std::set<std::string> project_targets;
// for each local generator
for (const auto& localGen : this->LocalGenerators) {
@@ -907,18 +910,30 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule(
(type == cmStateEnums::STATIC_LIBRARY) ||
(type == cmStateEnums::SHARED_LIBRARY) ||
(type == cmStateEnums::MODULE_LIBRARY) ||
(type == cmStateEnums::OBJECT_LIBRARY) ||
(type == cmStateEnums::GLOBAL_TARGET) ||
(type == cmStateEnums::UTILITY)) {
std::string const& name = target->GetName();
if (emittedTargets.insert(name).second) {
path = cmStrCat("... ", name);
lg->AppendEcho(commands, path);
}
(type == cmStateEnums::OBJECT_LIBRARY)) {
project_targets.insert(target->GetName());
} else if (type == cmStateEnums::GLOBAL_TARGET) {
globals_targets.insert(target->GetName());
} else if (type == cmStateEnums::UTILITY) {
utility_targets.insert(target->GetName());
}
}
}
}
for (std::string const& name : globals_targets) {
path = cmStrCat("... ", name);
lg->AppendEcho(commands, path);
}
for (std::string const& name : utility_targets) {
path = cmStrCat("... ", name);
lg->AppendEcho(commands, path);
}
for (std::string const& name : project_targets) {
path = cmStrCat("... ", name);
lg->AppendEcho(commands, path);
}
for (std::string const& o : lg->GetLocalHelp()) {
path = cmStrCat("... ", o);
lg->AppendEcho(commands, path);