[Cmake-commits] CMake branch, master, updated. v3.2.2-1322-gc12fc35

Brad King brad.king at kitware.com
Wed May 27 09:23:02 EDT 2015


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  c12fc3573bd86122279467e662b7ec58c72b5ffa (commit)
       via  3b880a07417a0211001b8dfa721ec220e6d8d2e3 (commit)
       via  e12afe766ee9083637ac819ec69a7b4512c39718 (commit)
       via  c7b79aa16adc1117e62bf146c64f97c992ec2e2e (commit)
       via  01e1cd5c1fc5e2684ec69d4916dd31ed23746055 (commit)
      from  94e4b5d2c36e541919ebabb8c7f8cca5abf36a09 (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=c12fc3573bd86122279467e662b7ec58c72b5ffa
commit c12fc3573bd86122279467e662b7ec58c72b5ffa
Merge: 94e4b5d 3b880a0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 27 09:23:01 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 27 09:23:01 2015 -0400

    Merge topic 'inject-state-snapshot'
    
    3b880a07 cmLocalGenerator: Require a valid cmState::Snapshot in the ctor.
    e12afe76 cmState: Host some state from the cmGlobalGenerator.
    c7b79aa1 cmGlobalGenerator: Require a cmake instance in ctor.
    01e1cd5c cmState: Move snapshot creation to the cmake instance.


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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx           |    3 +-
 Source/CPack/cpack.cxx                      |    3 +-
 Source/CTest/cmCTestLaunch.cxx              |    3 +-
 Source/CTest/cmCTestScriptHandler.cxx       |    3 +-
 Source/CTest/cmCTestTestHandler.cxx         |    3 +-
 Source/cmCTest.cxx                          |    3 +-
 Source/cmGlobalBorlandMakefileGenerator.cxx |    9 ++-
 Source/cmGlobalBorlandMakefileGenerator.h   |    5 +-
 Source/cmGlobalGenerator.cxx                |   33 ++++----
 Source/cmGlobalGenerator.h                  |   20 ++---
 Source/cmGlobalGeneratorFactory.h           |    9 ++-
 Source/cmGlobalGhsMultiGenerator.cxx        |    9 ++-
 Source/cmGlobalGhsMultiGenerator.h          |    5 +-
 Source/cmGlobalJOMMakefileGenerator.cxx     |    7 +-
 Source/cmGlobalJOMMakefileGenerator.h       |    2 +-
 Source/cmGlobalMSYSMakefileGenerator.cxx    |    5 +-
 Source/cmGlobalMSYSMakefileGenerator.h      |    2 +-
 Source/cmGlobalMinGWMakefileGenerator.cxx   |    7 +-
 Source/cmGlobalMinGWMakefileGenerator.h     |    2 +-
 Source/cmGlobalNMakeMakefileGenerator.cxx   |    7 +-
 Source/cmGlobalNMakeMakefileGenerator.h     |    2 +-
 Source/cmGlobalNinjaGenerator.cxx           |   11 +--
 Source/cmGlobalNinjaGenerator.h             |    6 +-
 Source/cmGlobalUnixMakefileGenerator3.cxx   |    8 +-
 Source/cmGlobalUnixMakefileGenerator3.h     |    5 +-
 Source/cmGlobalVisualStudio10Generator.cxx  |   22 +++--
 Source/cmGlobalVisualStudio10Generator.h    |    5 +-
 Source/cmGlobalVisualStudio11Generator.cxx  |   19 ++---
 Source/cmGlobalVisualStudio11Generator.h    |    2 +-
 Source/cmGlobalVisualStudio12Generator.cxx  |   17 ++--
 Source/cmGlobalVisualStudio12Generator.h    |    2 +-
 Source/cmGlobalVisualStudio14Generator.cxx  |   17 ++--
 Source/cmGlobalVisualStudio14Generator.h    |    2 +-
 Source/cmGlobalVisualStudio6Generator.cxx   |    8 +-
 Source/cmGlobalVisualStudio6Generator.h     |    5 +-
 Source/cmGlobalVisualStudio71Generator.cxx  |    4 +-
 Source/cmGlobalVisualStudio71Generator.h    |    3 +-
 Source/cmGlobalVisualStudio7Generator.cxx   |    8 +-
 Source/cmGlobalVisualStudio7Generator.h     |    6 +-
 Source/cmGlobalVisualStudio8Generator.cxx   |   18 ++---
 Source/cmGlobalVisualStudio8Generator.h     |    2 +-
 Source/cmGlobalVisualStudio9Generator.cxx   |   21 +++--
 Source/cmGlobalVisualStudio9Generator.h     |    2 +-
 Source/cmGlobalVisualStudioGenerator.cxx    |    7 +-
 Source/cmGlobalVisualStudioGenerator.h      |    2 +-
 Source/cmGlobalWatcomWMakeGenerator.cxx     |    7 +-
 Source/cmGlobalWatcomWMakeGenerator.h       |    2 +-
 Source/cmGlobalXCodeGenerator.cxx           |   19 +++--
 Source/cmGlobalXCodeGenerator.h             |    5 +-
 Source/cmGraphVizWriter.cxx                 |    3 +-
 Source/cmLocalGenerator.cxx                 |   45 ++++++-----
 Source/cmLocalGenerator.h                   |    3 +-
 Source/cmLocalGhsMultiGenerator.cxx         |    5 +-
 Source/cmLocalGhsMultiGenerator.h           |    3 +-
 Source/cmLocalNinjaGenerator.cxx            |    5 +-
 Source/cmLocalNinjaGenerator.h              |    3 +-
 Source/cmLocalUnixMakefileGenerator3.cxx    |    5 +-
 Source/cmLocalUnixMakefileGenerator3.h      |    3 +-
 Source/cmLocalVisualStudio10Generator.cxx   |    5 +-
 Source/cmLocalVisualStudio10Generator.h     |    3 +-
 Source/cmLocalVisualStudio6Generator.cxx    |    5 +-
 Source/cmLocalVisualStudio6Generator.h      |    3 +-
 Source/cmLocalVisualStudio7Generator.cxx    |    5 +-
 Source/cmLocalVisualStudio7Generator.h      |    3 +-
 Source/cmLocalVisualStudioGenerator.cxx     |    5 +-
 Source/cmLocalVisualStudioGenerator.h       |    3 +-
 Source/cmLocalXCodeGenerator.cxx            |    5 +-
 Source/cmLocalXCodeGenerator.h              |    3 +-
 Source/cmMakefile.cxx                       |    5 +-
 Source/cmQtAutoGenerators.cxx               |    3 +-
 Source/cmState.cxx                          |  117 +++++++++++++++++++++++----
 Source/cmState.h                            |   21 ++++-
 Source/cmake.cxx                            |   21 ++---
 Source/cmake.h                              |    5 ++
 74 files changed, 390 insertions(+), 274 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list