summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileTargetGenerator.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-06-12 15:40:31 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-06-12 15:40:31 (GMT)
commit14cc1efe2ce7690fcf689558bc1862f8f908c2cb (patch)
tree74521854b723f56f5e821d565e4a52f61c869de0 /Source/cmMakefileTargetGenerator.cxx
parenta21a320a2654336f196349c46eb3f0825da59fd3 (diff)
downloadCMake-14cc1efe2ce7690fcf689558bc1862f8f908c2cb.zip
CMake-14cc1efe2ce7690fcf689558bc1862f8f908c2cb.tar.gz
CMake-14cc1efe2ce7690fcf689558bc1862f8f908c2cb.tar.bz2
ENH: some cleanup to progress
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileTargetGenerator.cxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index c5bf92d..7ab801b 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -408,20 +408,21 @@ cmMakefileTargetGenerator
cmGlobalUnixMakefileGenerator3* gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
int prog = gg->ShouldAddProgressRule();
+
+ std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+ progressDir += "/CMakeFiles";
+ cmOStringStream progCmd;
+ progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
+ progCmd << this->LocalGenerator->Convert(progressDir.c_str(),
+ cmLocalGenerator::FULL,
+ cmLocalGenerator::SHELL);
if (prog)
{
- std::string progressDir = this->Makefile->GetHomeOutputDirectory();
- progressDir += "/CMakeFiles";
- cmOStringStream progCmd;
- progCmd << "$(CMAKE_COMMAND) -E cmake_progress_report ";
- progCmd << this->LocalGenerator->Convert(progressDir.c_str(),
- cmLocalGenerator::FULL,
- cmLocalGenerator::SHELL);
progCmd << " " << prog;
- commands.push_back(progCmd.str());
this->LocalGenerator->ProgressFiles[this->Target->GetName()].
push_back(prog);
}
+ commands.push_back(progCmd.str());
// Construct the compile rules.
std::string compileRuleVar = "CMAKE_";