[Cmake-commits] CMake branch, master, updated. v3.0.0-rc6-1059-g88818b6

[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  88818b680549651b6531a6648396d749b759afb2 (commit)
       via  528e8af19f68c01c3a42af9e74801a39c16237dd (commit)
       via  98afb4549f66c692eeec8bbc8a1f7b333d3051a5 (commit)
       via  3e9f6e36f3f5fd50303d1b71fc153c0ae8f916f5 (commit)
      from  64f399322051c16ea1a81cde19d5eec0fb846ca9 (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=88818b680549651b6531a6648396d749b759afb2
commit 88818b680549651b6531a6648396d749b759afb2
Merge: 64f3993 528e8af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 5 11:31:00 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 5 11:31:00 2014 -0400

    Merge topic 'delay-generator-toolset'
    
    528e8af1 Allow a toolchain file to specify a generator toolset
    98afb454 VS: Split user- and generator-provided PlatformToolset
    3e9f6e36 Xcode: Rename internal variable {Platform => Generator}Toolset


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

Summary of changes:
 Help/release/dev/delay-generator-toolset.rst       |    8 +++++
 Help/variable/CMAKE_GENERATOR_TOOLSET.rst          |    6 ++++
 Source/cmGlobalGenerator.cxx                       |   15 +++++++--
 Source/cmGlobalGenerator.h                         |    2 +-
 Source/cmGlobalVisualStudio10Generator.cxx         |   32 ++++++++++++++------
 Source/cmGlobalVisualStudio10Generator.h           |    8 +++--
 Source/cmGlobalVisualStudio11Generator.cxx         |    2 +-
 Source/cmGlobalVisualStudio12Generator.cxx         |    2 +-
 Source/cmGlobalXCodeGenerator.cxx                  |   18 +++++------
 Source/cmGlobalXCodeGenerator.h                    |    4 +--
 Source/cmake.cxx                                   |    5 ---
 .../GeneratorToolset/BadToolset-stderr.txt         |    2 +-
 .../GeneratorToolset/BadToolset-toolchain.cmake    |    1 +
 .../BadToolsetToolchain-result.txt}                |    0
 ...t-stderr.txt => BadToolsetToolchain-stderr.txt} |    2 +-
 ...{BadToolset.cmake => BadToolsetToolchain.cmake} |    0
 Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake |   11 +++++++
 .../GeneratorToolset/TestToolset-toolchain.cmake   |    1 +
 .../TestToolsetToolchain-result.txt}               |    0
 .../TestToolsetToolchain-stderr.txt                |    9 ++++++
 .../GeneratorToolset/TestToolsetToolchain.cmake    |   25 +++++++++++++++
 21 files changed, 115 insertions(+), 38 deletions(-)
 create mode 100644 Help/release/dev/delay-generator-toolset.rst
 create mode 100644 Tests/RunCMake/GeneratorToolset/BadToolset-toolchain.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorToolset/BadToolsetToolchain-result.txt} (100%)
 copy Tests/RunCMake/GeneratorToolset/{BadToolset-stderr.txt => BadToolsetToolchain-stderr.txt} (68%)
 copy Tests/RunCMake/GeneratorToolset/{BadToolset.cmake => BadToolsetToolchain.cmake} (100%)
 create mode 100644 Tests/RunCMake/GeneratorToolset/TestToolset-toolchain.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorToolset/TestToolsetToolchain-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorToolset/TestToolsetToolchain-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorToolset/TestToolsetToolchain.cmake


hooks/post-receive
-- 
CMake