Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 22:37:30 +08:00
Code Issues Projects Releases Wiki Activity

cmLocalGenerator: Re-order logic in CreateGeneratedSource

Browse Source 
Return early on errors to reduce nesting.
This commit is contained in:
Brad King
2020-10-19 15:06:39 -04:00
parent 706c48301d
commit e4034eabe9
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmLocalGenerator.cxx
View File

@@ -3816,18 +3816,19 @@ void CreateGeneratedSource(cmLocalGenerator& lg, const std::string& output,
cmCommandOrigin origin, cmCommandOrigin origin,
const cmListFileBacktrace& lfbt) const cmListFileBacktrace& lfbt)
{ {
if (cmGeneratorExpression::Find(output) == std::string::npos) { if (cmGeneratorExpression::Find(output) != std::string::npos) {
// Outputs without generator expressions from the project are already
// created and marked as generated. Do not mark them again, because
// other commands might have overwritten the property.
if (origin == cmCommandOrigin::Generator) {
lg.GetMakefile()->GetOrCreateGeneratedSource(output);
}
} else {
lg.GetCMakeInstance()->IssueMessage( lg.GetCMakeInstance()->IssueMessage(
MessageType::FATAL_ERROR, MessageType::FATAL_ERROR,
"Generator expressions in custom command outputs are not implemented!", "Generator expressions in custom command outputs are not implemented!",
lfbt); lfbt);
return;
}
// Outputs without generator expressions from the project are already
// created and marked as generated. Do not mark them again, because
// other commands might have overwritten the property.
if (origin == cmCommandOrigin::Generator) {
lg.GetMakefile()->GetOrCreateGeneratedSource(output);
} }
} }