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

cmMakefile: Use the state to determine the parent directory. 

Do not depend on the local generator for that.
This commit is contained in:
Stephen Kelly 2015-05-13 20:42:16 +02:00
parent 115e919982
commit 894961af16
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmMakefile.cxx
View File

@ -4117,11 +4117,12 @@ const char *cmMakefile::GetProperty(const std::string& prop,
output = ""; output = "";
if (prop == "PARENT_DIRECTORY") if (prop == "PARENT_DIRECTORY")
{ {
if(cmLocalGenerator* plg = this->LocalGenerator->GetParent()) cmState::Snapshot parent = this->StateSnapshot.GetParent();
if(parent.IsValid())
{ {
output = plg->GetMakefile()->GetCurrentSourceDirectory(); return parent.GetCurrentSourceDirectory();
} }
return output.c_str(); return "";
} }
else if (prop == "INCLUDE_REGULAR_EXPRESSION" ) else if (prop == "INCLUDE_REGULAR_EXPRESSION" )
{ {