[Cmake-commits] [cmake-commits] king committed cmMakefile.cxx 1.474 1.475

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv31663/Source

Modified Files:
	cmMakefile.cxx 
Log Message:
BUG: Fix PARENT_DIRECTORY property in top-level to not crash.


Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.474
retrieving revision 1.475
diff -C 2 -d -r1.474 -r1.475
*** cmMakefile.cxx	25 Jun 2008 13:44:56 -0000	1.474
--- cmMakefile.cxx	26 Jun 2008 14:58:16 -0000	1.475
***************
*** 2909,2914 ****
    if (!strcmp("PARENT_DIRECTORY",prop))
      {
!     output = this->LocalGenerator->GetParent()
!       ->GetMakefile()->GetStartDirectory();
      return output.c_str();
      }
--- 2909,2916 ----
    if (!strcmp("PARENT_DIRECTORY",prop))
      {
!     if(cmLocalGenerator* plg = this->LocalGenerator->GetParent())
!       {
!       output = plg->GetMakefile()->GetStartDirectory();
!       }
      return output.c_str();
      }