summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-07-13 18:03:56 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-07-13 18:03:56 (GMT)
commitad3ca4c009b4a79215bd09d23ddc1bf00bb0552a (patch)
tree2188b8d5ce80ebddf68dbc24fdfba9992f2c0a97
parent0d6b407630aa90cd08c312c03f326bc6f8a0037f (diff)
downloadCMake-ad3ca4c009b4a79215bd09d23ddc1bf00bb0552a.zip
CMake-ad3ca4c009b4a79215bd09d23ddc1bf00bb0552a.tar.gz
CMake-ad3ca4c009b4a79215bd09d23ddc1bf00bb0552a.tar.bz2
ENH: added progress to custom commands with comments
-rw-r--r--Source/cmMakefileTargetGenerator.cxx13
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 130aebe..335aa12 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -708,6 +708,19 @@ void cmMakefileTargetGenerator
std::string comment = this->LocalGenerator->ConstructComment(cc);
if(!comment.empty())
{
+ // add in a progress call if needed
+ std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+ progressDir += cmake::GetCMakeFilesDirectory();
+ cmOStringStream progCmd;
+ progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
+ progCmd << this->LocalGenerator->Convert(progressDir.c_str(),
+ cmLocalGenerator::FULL,
+ cmLocalGenerator::SHELL);
+ this->NumberOfProgressActions++;
+ progCmd << " $(CMAKE_PROGRESS_"
+ << this->NumberOfProgressActions
+ << ")";
+ commands.push_back(progCmd.str());
this->LocalGenerator
->AppendEcho(commands, comment.c_str(),
cmLocalUnixMakefileGenerator3::EchoGenerate);