[Cmake-commits] CMake branch, master, updated. v3.3.1-977-g0d0b9b5

[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  0d0b9b52f8a538a6327e2e9f848b943474afc682 (commit)
       via  637c56b4e0ce0205f3f28a670881aad07320ff17 (commit)
       via  b3f2299e0600f3488aaeb78ebf66d1108201ea17 (commit)
       via  6ce940ac9701c93be01ed169c6bd23b22e04782f (commit)
       via  e8c0341d86e3f2b9658dfc594641f9ba1b29165b (commit)
      from  6904b6efdc2ea35c3490ba33cb352b03ea3085f5 (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=0d0b9b52f8a538a6327e2e9f848b943474afc682
commit 0d0b9b52f8a538a6327e2e9f848b943474afc682
Merge: 6904b6e 637c56b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 27 10:04:09 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 27 10:04:09 2015 -0400

    Merge topic 'cmState-ProjectName'
    
    637c56b4 cmGlobalGenerator: Implement FillProjectMap in terms of cmState.
    b3f2299e cmState: Move ProjectName from cmMakefile.
    6ce940ac cmMakefile: Use std::string in ProjectName API.
    e8c0341d cmMakefile: Out-of-line GetProjectName.

diff --cc Source/cmState.cxx
index a401265,6cd58b6..b30c10b
--- a/Source/cmState.cxx
+++ b/Source/cmState.cxx
@@@ -75,9 -75,9 +75,11 @@@ struct cmState::BuildsystemDirectorySta
    std::vector<std::string> CompileOptions;
    std::vector<cmListFileBacktrace> CompileOptionsBacktraces;
  
+   std::string ProjectName;
+ 
    cmPropertyMap Properties;
 +
 +  std::vector<cmState::Snapshot> Children;
  };
  
  cmState::cmState(cmake* cm)

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

Summary of changes:
 Source/cmCPluginAPI.cxx      |    4 +++-
 Source/cmGlobalGenerator.cxx |   11 ++++++-----
 Source/cmMakefile.cxx        |   10 +++++++---
 Source/cmMakefile.h          |    9 ++-------
 Source/cmProjectCommand.cxx  |    2 +-
 Source/cmState.cxx           |   12 ++++++++++++
 Source/cmState.h             |    3 +++
 7 files changed, 34 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake