diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-09 13:25:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-03-09 17:36:46 (GMT) |
| commit | a6b09085715d0d7f299e9ca76a4835ce5f5acfaf (patch) | |
| tree | 6eef8fba5d1deed9b3b0ec13e66874a7851520fb /Source | |
| parent | 99575c9ac114e6f5d388e1ee7b9a3f788d773c9e (diff) | |
| download | CMake-a6b09085715d0d7f299e9ca76a4835ce5f5acfaf.zip CMake-a6b09085715d0d7f299e9ca76a4835ce5f5acfaf.tar.gz CMake-a6b09085715d0d7f299e9ca76a4835ce5f5acfaf.tar.bz2 | |
Ninja: Improve internal check for generating at the top-level (#15436)
Simply check for whether the local generator has a parent instead of
depending on a string comparison of directory names.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 3a9d5be..d64ae0f 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -130,7 +130,7 @@ public: std::string ConvertToOptionallyRelativeOutputPath(const std::string& remote); ///! set/get the parent generator - cmLocalGenerator* GetParent(){return this->Parent;} + cmLocalGenerator* GetParent() const {return this->Parent;} void SetParent(cmLocalGenerator* g) { this->Parent = g; g->AddChild(this); } ///! set/get the children diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 413dc0f..640c1b3 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -182,8 +182,7 @@ cmake* cmLocalNinjaGenerator::GetCMakeInstance() bool cmLocalNinjaGenerator::isRootMakefile() const { - return (strcmp(this->Makefile->GetCurrentDirectory(), - this->GetCMakeInstance()->GetHomeDirectory()) == 0); + return !this->GetParent(); } void cmLocalNinjaGenerator::WriteBuildFileTop() |