Browse Source

cmMakefile: Use the state to determine the parent directory.

Do not depend on the local generator for that.
Stephen Kelly 10 years ago
parent
commit
894961af16
1 changed files with 4 additions and 3 deletions
  1. 4 3
      Source/cmMakefile.cxx

+ 4 - 3
Source/cmMakefile.cxx

@@ -4117,11 +4117,12 @@ const char *cmMakefile::GetProperty(const std::string& prop,
   output = "";
   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" )
     {