[Cmake-commits] CMake branch, master, updated. v3.3.0-rc4-504-gae64efa

[Brad King]

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, master has been updated
       via  ae64efa1ce9097f27c1dbfb2b6a14ccf512e16b7 (commit)
       via  9ebc7502b2e4cf991e721b695aead2c366eb0bef (commit)
       via  27ec21dbb2370ac71aebc0089d4269f27661f4b8 (commit)
      from  93b393e74c3a7508fe013b423809e7e35f9bc8a0 (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=ae64efa1ce9097f27c1dbfb2b6a14ccf512e16b7
commit ae64efa1ce9097f27c1dbfb2b6a14ccf512e16b7
Merge: 93b393e 9ebc750
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 21 09:22:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 21 09:22:19 2015 -0400

    Merge topic 'cmState-Directory'
    
    9ebc7502 cmState: Extract a Directory class.
    27ec21db cmState: Forward-declare a type earlier.

diff --cc Source/cmMakefile.cxx
index 80619d1,0432002..c68d8c9
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -1700,9 -1704,10 +1700,9 @@@ public
      : Makefile(mf), ReportError(true)
    {
      std::string currentStart =
-         this->Makefile->StateSnapshot.GetCurrentSourceDirectory();
+         this->Makefile->StateSnapshot.GetDirectory().GetCurrentSource();
      currentStart += "/CMakeLists.txt";
      this->Makefile->StateSnapshot.SetListFile(currentStart);
 -    this->Makefile->ListFileStack.push_back(currentStart);
      this->Makefile->PushPolicyBarrier();
      this->Makefile->PushFunctionBlockerBarrier();
  

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

Summary of changes:
 Source/cmLocalGenerator.cxx              |   43 +++++++++-------
 Source/cmLocalUnixMakefileGenerator3.cxx |   10 ++--
 Source/cmMakefile.cxx                    |   21 ++++----
 Source/cmOutputConverter.cxx             |   34 ++++++++-----
 Source/cmState.cxx                       |   82 +++++++++++++++++-------------
 Source/cmState.h                         |   54 +++++++++++++-------
 6 files changed, 142 insertions(+), 102 deletions(-)


hooks/post-receive
-- 
CMake