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

7
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1446,8 +1446,6 @@ 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(); std::string progressDir = this->Makefile->GetHomeOutputDirectory();
progressDir += cmake::GetCMakeFilesDirectory(); progressDir += cmake::GetCMakeFilesDirectory();
cmOStringStream progCmd; cmOStringStream progCmd;
@ -1462,9 +1460,12 @@ void cmLocalUnixMakefileGenerator3
{ {
n = 100; n = 100;
} }
if (this->Parent)
{
n = 0;
}
progCmd << " " << n; progCmd << " " << n;
commands.push_back(progCmd.str()); commands.push_back(progCmd.str());
}
std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash();
mf2Dir += "Makefile2"; mf2Dir += "Makefile2";