summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-06-27 14:24:09 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-06-27 14:24:09 (GMT)
commitbec28bb03b0a7cbed3d984fdf52ed5a85e101f85 (patch)
tree57e99766647a99f1243fc878f1679fd9fe7bb2ee /Source/cmLocalUnixMakefileGenerator3.cxx
parent88e3cd53ab069aa8729cbc5905aa3a4112917e29 (diff)
downloadCMake-bec28bb03b0a7cbed3d984fdf52ed5a85e101f85.zip
CMake-bec28bb03b0a7cbed3d984fdf52ed5a85e101f85.tar.gz
CMake-bec28bb03b0a7cbed3d984fdf52ed5a85e101f85.tar.bz2
ENH: fix for subdir all target after control c
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx37
1 files changed, 19 insertions, 18 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 575cd55..03311b6 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1446,26 +1446,27 @@ void cmLocalUnixMakefileGenerator3
depends.push_back("cmake_check_build_system");
- if (!this->Parent)
- {
- std::string progressDir = this->Makefile->GetHomeOutputDirectory();
- progressDir += cmake::GetCMakeFilesDirectory();
- cmOStringStream progCmd;
- progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # src files
- progCmd << this->Convert(progressDir.c_str(),
- cmLocalGenerator::FULL,
- cmLocalGenerator::SHELL);
- cmGlobalUnixMakefileGenerator3 *gg =
+ std::string progressDir = this->Makefile->GetHomeOutputDirectory();
+ progressDir += cmake::GetCMakeFilesDirectory();
+ cmOStringStream progCmd;
+ 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);
- int n = gg->GetNumberOfSourceFiles();
- if(n > 100)
- {
- n = 100;
- }
- progCmd << " " << n;
- commands.push_back(progCmd.str());
+ int n = gg->GetNumberOfSourceFiles();
+ if(n > 100)
+ {
+ n = 100;
}
-
+ if (this->Parent)
+ {
+ n = 0;
+ }
+ progCmd << " " << n;
+ commands.push_back(progCmd.str());
+
std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash();
mf2Dir += "Makefile2";
commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),