[Cmake-commits] CMake branch, master, updated. v3.3.0-rc2-258-g56e5d4e

[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  56e5d4e18095734a4418159f05dfc1e5c53f2877 (commit)
       via  e77142350de1dec03ca788e3d3e278b7b9358fb5 (commit)
       via  5aa556be560b782d149b53bccc12dfc2be2bda0b (commit)
       via  bb88668addb3746f6f043533f0405914834a0421 (commit)
       via  a3b210fd6cb85cba76f867e93d94dd835fa3278a (commit)
       via  8ec60c675a3fb4294776b2d644974361b145c444 (commit)
       via  dee197fe610b5fe50403da796539b63a74430bd3 (commit)
       via  b2b41b83ff594555f3b80c6c2fd12e10e1e97458 (commit)
       via  2e9333a1d0979c4d6ecfe8fd16382ea6526dec9c (commit)
      from  5ab7dd544e2d10bf6b05ab046a852b84eee63126 (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=56e5d4e18095734a4418159f05dfc1e5c53f2877
commit 56e5d4e18095734a4418159f05dfc1e5c53f2877
Merge: 5ab7dd5 e771423
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 23 09:08:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 23 09:08:20 2015 -0400

    Merge topic 'use-generator-target'
    
    e7714235 Get the local generator from the GeneratorTarget.
    5aa556be cmMakefileTargetGenerator: Require cmGeneratorTarget.
    bb88668a cmNinjaGenerator: Require cmGeneratorTarget.
    a3b210fd cmGeneratorTarget: Require a cmLocalGenerator to construct.
    8ec60c67 cmGlobalGenerator: Create GeneratorTargets with a local generator.
    dee197fe GHS: Use a cmGeneratorTarget in generator API.
    b2b41b83 cmGeneratorTarget: Add accessor for cmLocalGenerator.
    2e9333a1 C::B: Get the Makefile from the LocalGenerator, not vice-versa.


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

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx          |   24 +++++++++++++-----------
 Source/cmExtraCodeBlocksGenerator.h            |    5 +++--
 Source/cmGeneratorTarget.cxx                   |   10 ++++++++--
 Source/cmGeneratorTarget.h                     |    4 +++-
 Source/cmGhsMultiTargetGenerator.cxx           |   18 +++++++++---------
 Source/cmGhsMultiTargetGenerator.h             |    3 ++-
 Source/cmGlobalGenerator.cxx                   |    9 +++++----
 Source/cmGlobalGenerator.h                     |    2 +-
 Source/cmLocalGhsMultiGenerator.cxx            |    2 +-
 Source/cmMakefileExecutableTargetGenerator.cxx |    2 +-
 Source/cmMakefileLibraryTargetGenerator.cxx    |    2 +-
 Source/cmMakefileTargetGenerator.cxx           |   13 +++++++------
 Source/cmMakefileTargetGenerator.h             |    2 +-
 Source/cmMakefileUtilityTargetGenerator.cxx    |    2 +-
 Source/cmNinjaNormalTargetGenerator.cxx        |    2 +-
 Source/cmNinjaTargetGenerator.cxx              |   11 +++++------
 Source/cmNinjaTargetGenerator.h                |    2 +-
 Source/cmNinjaUtilityTargetGenerator.cxx       |    2 +-
 Source/cmOSXBundleGenerator.cxx                |    2 +-
 Source/cmQtAutoGenerators.cxx                  |    6 +++---
 Source/cmVisualStudio10TargetGenerator.cxx     |    2 +-
 Source/cmake.cxx                               |    2 +-
 22 files changed, 70 insertions(+), 57 deletions(-)


hooks/post-receive
-- 
CMake