From 25b43a5b7fdc6216278f45fc6e7e65e0f50ed3b2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 10 Dec 2024 11:26:54 -0500 Subject: Makefile: Enable progress messages for codegen target This was left out of commit 197cb419d1 (add_custom_command: Add CODEGEN support, 2024-05-27, v3.31.0-rc1~394^2). --- Source/cmGlobalUnixMakefileGenerator3.cxx | 4 ++++ Source/cmLocalUnixMakefileGenerator3.cxx | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 38cc4f6..32c2a20 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -777,6 +777,10 @@ void cmGlobalUnixMakefileGenerator3::WriteConvenienceRules2( makeTargetName = cmStrCat(localName, "/codegen"); commands.push_back( lg.GetRecursiveMakeCall(makefileName, makeTargetName)); + if (targetMessages) { + lg.AppendEcho(commands, "Finished codegen for target " + name, + cmLocalUnixMakefileGenerator3::EchoNormal, &progress); + } this->AppendCodegenTargetDepends(depends, gtarget.get()); rootLG.WriteMakeRule(ruleFileStream, "codegen rule for target.", makeTargetName, depends, commands, true); diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index d6f1233..1e58f0b 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -1761,11 +1761,11 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules( if (regenerate) { depends.emplace_back("cmake_check_build_system"); } + commands.emplace_back(progressStartCommand); commands.push_back(this->GetRecursiveMakeCall(mf2Dir, recursiveTarget)); this->CreateCDCommand(commands, this->GetBinaryDirectory(), this->GetCurrentBinaryDirectory()); - AppendEcho(commands, "Finished generating code", - cmLocalUnixMakefileGenerator3::EchoColor::EchoGenerate); + commands.emplace_back(progressFinishCommand); this->WriteMakeRule(ruleFileStream, "The main codegen target", "codegen", depends, commands, true); } -- cgit v0.12