dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-07 16:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmMakefileTargetGenerator: Simplify custom command output collection

Browse Source
This commit is contained in:
Brad King
2020-09-04 13:53:34 -04:00
parent b1b345c21a
commit 844779bdc1
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmMakefileTargetGenerator.cxx
View File

@@ -1290,16 +1290,7 @@ void cmMakefileTargetGenerator::DriveCustomCommands(
std::vector<std::string>& depends) std::vector<std::string>& depends)
{ {
// Depend on all custom command outputs. // Depend on all custom command outputs.
std::vector<cmSourceFile*> sources; cm::append(depends, this->CustomCommandOutputs);
this->GeneratorTarget->GetSourceFiles(
sources, this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
for (cmSourceFile* source : sources) {
if (cmCustomCommand* cc = source->GetCustomCommand()) {
cmCustomCommandGenerator ccg(*cc, this->GetConfigName(),
this->LocalGenerator);
cm::append(depends, ccg.GetOutputs());
}
}
} }
void cmMakefileTargetGenerator::WriteObjectDependRules( void cmMakefileTargetGenerator::WriteObjectDependRules(
@@ -1360,6 +1351,8 @@ void cmMakefileTargetGenerator::GenerateCustomRuleFile(
this->LocalGenerator->AddImplicitDepends(this->GeneratorTarget, idi.first, this->LocalGenerator->AddImplicitDepends(this->GeneratorTarget, idi.first,
objFullPath, srcFullPath); objFullPath, srcFullPath);
} }
this->CustomCommandOutputs.insert(outputs.begin(), outputs.end());
} }
void cmMakefileTargetGenerator::MakeEchoProgress( void cmMakefileTargetGenerator::MakeEchoProgress(

3
Source/cmMakefileTargetGenerator.h
View File

@@ -228,6 +228,9 @@ protected:
// Set of extra output files to be driven by the build. // Set of extra output files to be driven by the build.
std::set<std::string> ExtraFiles; std::set<std::string> ExtraFiles;
// Set of custom command output files to be driven by the build.
std::set<std::string> CustomCommandOutputs;
using MultipleOutputPairsType = std::map<std::string, std::string>; using MultipleOutputPairsType = std::map<std::string, std::string>;
MultipleOutputPairsType MultipleOutputPairs; MultipleOutputPairsType MultipleOutputPairs;
bool WriteMakeRule(std::ostream& os, const char* comment, bool WriteMakeRule(std::ostream& os, const char* comment,