summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-05-30 20:23:24 (GMT)
committerBrad King <brad.king@kitware.com>2006-05-30 20:23:24 (GMT)
commitd3073828f056ceb965aa33ed0c04477d3dba7fa8 (patch)
treedf63bebd9456ecbd2ebd19b35a34e897de42db00 /Source/cmLocalUnixMakefileGenerator3.cxx
parentd9e060e0625edfe523210f66e023b3367f5a2775 (diff)
downloadCMake-d3073828f056ceb965aa33ed0c04477d3dba7fa8.zip
CMake-d3073828f056ceb965aa33ed0c04477d3dba7fa8.tar.gz
CMake-d3073828f056ceb965aa33ed0c04477d3dba7fa8.tar.bz2
BUG: Fix progress when total number of source files is less than 100.
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index ae7cd04..a3bd5c9 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1402,13 +1402,18 @@ void cmLocalUnixMakefileGenerator3
std::string progressDir = this->Makefile->GetHomeOutputDirectory();
progressDir += "/CMakeFiles";
cmOStringStream progCmd;
- progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
+ progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # src files
progCmd << this->Convert(progressDir.c_str(),
cmLocalGenerator::FULL,
cmLocalGenerator::SHELL);
cmGlobalUnixMakefileGenerator3 *gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
- progCmd << " " << gg->GetNumberOfSourceFiles();
+ int n = gg->GetNumberOfSourceFiles();
+ if(n > 100)
+ {
+ n = 100;
+ }
+ progCmd << " " << n;
commands.push_back(progCmd.str());
}
@@ -1422,7 +1427,7 @@ void cmLocalUnixMakefileGenerator3
std::string progressDir = this->Makefile->GetHomeOutputDirectory();
progressDir += "/CMakeFiles";
cmOStringStream progCmd;
- progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start ";
+ progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0
progCmd << this->Convert(progressDir.c_str(),
cmLocalGenerator::FULL,
cmLocalGenerator::SHELL);