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

cmLocalUnixMakefileGenerator3: Port away from the Parent.

This commit is contained in:
Stephen Kelly 2015-07-18 18:43:17 +02:00
parent 5505bff7ae
commit cff2dc34f9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -256,7 +256,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
return; return;
} }
// always write the top makefile // always write the top makefile
if (this->Parent) if (!this->GetMakefile()->IsRootMakefile())
{ {
ruleFileStream.SetCopyIfDifferent(true); ruleFileStream.SetCopyIfDifferent(true);
} }
@ -267,7 +267,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
// only write local targets unless at the top Keep track of targets already // only write local targets unless at the top Keep track of targets already
// listed. // listed.
std::set<std::string> emittedTargets; std::set<std::string> emittedTargets;
if (this->Parent) if (!this->GetMakefile()->IsRootMakefile())
{ {
// write our targets, and while doing it collect up the object // write our targets, and while doing it collect up the object
// file rules // file rules
@ -888,7 +888,7 @@ void cmLocalUnixMakefileGenerator3
std::vector<std::string> no_depends; std::vector<std::string> no_depends;
std::vector<std::string> commands; std::vector<std::string> commands;
commands.push_back(runRule); commands.push_back(runRule);
if(this->Parent) if(!this->GetMakefile()->IsRootMakefile())
{ {
this->CreateCDCommand(commands, this->CreateCDCommand(commands,
this->Makefile->GetHomeOutputDirectory(), this->Makefile->GetHomeOutputDirectory(),