diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-18 16:43:17 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-07-18 16:43:17 (GMT) |
| commit | cff2dc34f98fd0960a5ec1b37d9bf5f937c31efc (patch) | |
| tree | 1a0a9dcdb92521782915c7c9d857da86710a2803 | |
| parent | 5505bff7ae85b84fbdb60604de6bb4a515cd3e8a (diff) | |
| download | CMake-cff2dc34f98fd0960a5ec1b37d9bf5f937c31efc.zip CMake-cff2dc34f98fd0960a5ec1b37d9bf5f937c31efc.tar.gz CMake-cff2dc34f98fd0960a5ec1b37d9bf5f937c31efc.tar.bz2 | |
cmLocalUnixMakefileGenerator3: Port away from the Parent.
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 5d17a40..64f8bb8 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -256,7 +256,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile() return; } // always write the top makefile - if (this->Parent) + if (!this->GetMakefile()->IsRootMakefile()) { ruleFileStream.SetCopyIfDifferent(true); } @@ -267,7 +267,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile() // only write local targets unless at the top Keep track of targets already // listed. std::set<std::string> emittedTargets; - if (this->Parent) + if (!this->GetMakefile()->IsRootMakefile()) { // write our targets, and while doing it collect up the object // file rules @@ -888,7 +888,7 @@ void cmLocalUnixMakefileGenerator3 std::vector<std::string> no_depends; std::vector<std::string> commands; commands.push_back(runRule); - if(this->Parent) + if(!this->GetMakefile()->IsRootMakefile()) { this->CreateCDCommand(commands, this->Makefile->GetHomeOutputDirectory(), |