diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-05-14 18:47:36 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-05-14 18:47:36 (GMT) |
| commit | 115e9199822a6c9395cc3bb55c57e061b5fc6315 (patch) | |
| tree | 9716dc4d426e21bd9fb8dc97270f238fefc92079 /Source | |
| parent | c5059c900036fd9500d64fbd7f9d2d3631152295 (diff) | |
| download | CMake-115e9199822a6c9395cc3bb55c57e061b5fc6315.zip CMake-115e9199822a6c9395cc3bb55c57e061b5fc6315.tar.gz CMake-115e9199822a6c9395cc3bb55c57e061b5fc6315.tar.bz2 | |
Use new top-level check abstraction.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 4 | ||||
| -rw-r--r-- | Source/cmProjectCommand.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index f5731f4..a4df493 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -522,7 +522,7 @@ cmGlobalUnixMakefileGenerator3 cmLocalUnixMakefileGenerator3* lg) { // Only subdirectories need these rules. - if(!lg->GetParent()) + if(lg->IsRootMakefile()) { return; } @@ -1027,7 +1027,7 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule static_cast<cmLocalUnixMakefileGenerator3 *>(this->LocalGenerators[i]); // for the passed in makefile or if this is the top Makefile wripte out // the targets - if (lg2 == lg || !lg->GetParent()) + if (lg2 == lg || lg->IsRootMakefile()) { // for each target Generate the rule files for each target. cmTargets& targets = lg2->GetMakefile()->GetTargets(); diff --git a/Source/cmProjectCommand.cxx b/Source/cmProjectCommand.cxx index a9029a0..176cb0d 100644 --- a/Source/cmProjectCommand.cxx +++ b/Source/cmProjectCommand.cxx @@ -53,7 +53,7 @@ bool cmProjectCommand // CMAKE_PROJECT_NAME will match PROJECT_NAME, and cmake --build // will work. if(!this->Makefile->GetDefinition("CMAKE_PROJECT_NAME") - || (this->Makefile->GetLocalGenerator()->GetParent() == 0) ) + || (this->Makefile->GetLocalGenerator()->IsRootMakefile())) { this->Makefile->AddDefinition("CMAKE_PROJECT_NAME", args[0].c_str()); this->Makefile->AddCacheDefinition |