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

Merge branch 'ninja-check-root-robustly' into release

This commit is contained in:
Brad King 2015-03-09 13:37:15 -04:00
parent 77f3804ab2 a6b0908571
commit 244e3d0fc9
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmLocalGenerator.h
View File

@ -130,7 +130,7 @@ public:
std::string ConvertToOptionallyRelativeOutputPath(const std::string& remote); std::string ConvertToOptionallyRelativeOutputPath(const std::string& remote);
///! set/get the parent generator ///! 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); } void SetParent(cmLocalGenerator* g) { this->Parent = g; g->AddChild(this); }
///! set/get the children ///! set/get the children

3
Source/cmLocalNinjaGenerator.cxx
View File

@ -182,8 +182,7 @@ cmake* cmLocalNinjaGenerator::GetCMakeInstance()
bool cmLocalNinjaGenerator::isRootMakefile() const bool cmLocalNinjaGenerator::isRootMakefile() const
{ {
return (strcmp(this->Makefile->GetCurrentDirectory(), return !this->GetParent();
this->GetCMakeInstance()->GetHomeDirectory()) == 0);
} }
void cmLocalNinjaGenerator::WriteBuildFileTop() void cmLocalNinjaGenerator::WriteBuildFileTop()