kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix for subdir all target after control c

This commit is contained in:
Ken Martin 2006-06-27 10:24:09 -04:00
parent 88e3cd53ab
commit bec28bb03b
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1446,26 +1446,27 @@ void cmLocalUnixMakefileGenerator3
depends.push_back("cmake_check_build_system"); depends.push_back("cmake_check_build_system");
if (!this->Parent) std::string progressDir = this->Makefile->GetHomeOutputDirectory();
{ progressDir += cmake::GetCMakeFilesDirectory();
std::string progressDir = this->Makefile->GetHomeOutputDirectory(); cmOStringStream progCmd;
progressDir += cmake::GetCMakeFilesDirectory(); progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # src files
cmOStringStream progCmd; progCmd << this->Convert(progressDir.c_str(),
progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # src files cmLocalGenerator::FULL,
progCmd << this->Convert(progressDir.c_str(), cmLocalGenerator::SHELL);
cmLocalGenerator::FULL, cmGlobalUnixMakefileGenerator3 *gg =
cmLocalGenerator::SHELL);
cmGlobalUnixMakefileGenerator3 *gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator); static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
int n = gg->GetNumberOfSourceFiles(); int n = gg->GetNumberOfSourceFiles();
if(n > 100) if(n > 100)
{ {
n = 100; n = 100;
}
progCmd << " " << n;
commands.push_back(progCmd.str());
} }
if (this->Parent)
{
n = 0;
}
progCmd << " " << n;
commands.push_back(progCmd.str());
std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash();
mf2Dir += "Makefile2"; mf2Dir += "Makefile2";
commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(), commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),