From bec28bb03b0a7cbed3d984fdf52ed5a85e101f85 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Tue, 27 Jun 2006 10:24:09 -0400 Subject: [PATCH] ENH: fix for subdir all target after control c --- Source/cmLocalUnixMakefileGenerator3.cxx | 37 ++++++++++++------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 575cd5574..03311b6bf 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(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(),