[Cmake-commits] CMake branch, next, updated. v3.2.2-1996-gda1764e

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  da1764e593e3c183f2b60cf1c6ea69a14eee6e13 (commit)
       via  370534f264bd0ac4f121f7852a46d12a85a629c2 (commit)
      from  83597d46b404fbb57496466d1f05013836eb7da8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da1764e593e3c183f2b60cf1c6ea69a14eee6e13
commit da1764e593e3c183f2b60cf1c6ea69a14eee6e13
Merge: 83597d4 370534f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Apr 20 18:45:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 20 18:45:38 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    370534f2 fixup! cmMakefile: Use method abstraction to access directories.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=370534f264bd0ac4f121f7852a46d12a85a629c2
commit 370534f264bd0ac4f121f7852a46d12a85a629c2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Apr 21 00:43:22 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Apr 21 00:43:22 2015 +0200

    fixup! cmMakefile: Use method abstraction to access directories.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e0bae7f..7beb932 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -526,8 +526,9 @@ bool cmMakefile::ProcessBuildsystemFile(const char* listfile)
 {
   this->AddDefinition("CMAKE_PARENT_LIST_FILE", listfile);
   this->cmCurrentListFile = listfile;
+  std::string curSrc = this->GetCurrentSourceDirectory();
   return this->ReadListFile(listfile, true,
-                            this->cmStartDirectory == this->cmHomeDirectory);
+                            curSrc == this->GetHomeDirectory());
 }
 
 bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
@@ -535,7 +536,7 @@ bool cmMakefile::ReadDependentFile(const char* listfile, bool noPolicyScope)
   this->AddDefinition("CMAKE_PARENT_LIST_FILE", this->GetCurrentListFile());
   this->cmCurrentListFile =
     cmSystemTools::CollapseFullPath(listfile,
-                                    this->cmStartDirectory.c_str());
+                                    this->GetCurrentSourceDirectory());
   return this->ReadListFile(this->cmCurrentListFile.c_str(),
                             noPolicyScope);
 }
@@ -549,7 +550,7 @@ bool cmMakefile::ReadListFile(const char* listfile,
 {
   std::string filenametoread =
     cmSystemTools::CollapseFullPath(listfile,
-                                    this->cmStartDirectory.c_str());
+                                    this->GetCurrentSourceDirectory());
 
   std::string currentParentFile
       = this->GetSafeDefinition("CMAKE_PARENT_LIST_FILE");

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake