[Cmake-commits] CMake branch, master, updated. v3.0.2-1867-gb234836

[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  b234836637d97b2d9cc837829c485ec87e64c5ce (commit)
       via  be6a555d7ec9348575e3431bd6709f48dc959100 (commit)
       via  d506fee81ca8fca7fe0c91da4bd4a3551d210b06 (commit)
       via  11c9ddd6949eb7725de1f6b459508b23a81f25c1 (commit)
       via  29bd843e8bf8edde3cade3f565c9f5a042d14ca3 (commit)
       via  eb7d8156492c353f9972bdf6e2203657f5d6592e (commit)
      from  9edf6903e62f84a567db3938bb8fec3f19789545 (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=b234836637d97b2d9cc837829c485ec87e64c5ce
commit b234836637d97b2d9cc837829c485ec87e64c5ce
Merge: 9edf690 be6a555
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 15 10:27:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 15 10:27:38 2014 -0400

    Merge topic 'vs-generator-platform'
    
    be6a555d Tests: Test setting a generator platform in a toolchain file
    d506fee8 Tests: Use -A option to pass generator platform selection
    11c9ddd6 ExternalProject: Use -A option to pass generator platform
    29bd843e CTest: Use -A option to pass generator platform selection
    eb7d8156 cmake: Add -A option to specify a generator platform


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

Summary of changes:
 Help/manual/OPTIONS_BUILD.txt                      |   11 ++++++++++
 Help/release/dev/vs-generator-platform.rst         |    4 +++-
 Help/variable/CMAKE_GENERATOR_PLATFORM.rst         |    2 ++
 Modules/ExternalProject.cmake                      |    4 ++--
 Source/CTest/cmCTestBuildAndTestHandler.cxx        |    2 +-
 Source/CTest/cmCTestConfigureCommand.cxx           |    2 +-
 Source/cmake.cxx                                   |   22 ++++++++++++++++++++
 Source/cmake.h                                     |    1 +
 Tests/CMakeBuildTest.cmake.in                      |    2 +-
 Tests/CMakeLists.txt                               |    2 +-
 Tests/CMakeOnly/Test.cmake.in                      |    2 +-
 Tests/CTestConfig/dashboard.cmake.in               |    2 +-
 .../ExternalProjectUpdateTest.cmake                |    2 +-
 Tests/FortranC/Flags.cmake.in                      |    2 +-
 .../GeneratorPlatform/BadPlatform-toolchain.cmake  |    1 +
 .../BadPlatformToolchain-result.txt}               |    0
 ...-stderr.txt => BadPlatformToolchain-stderr.txt} |    0
 ...adPlatform.cmake => BadPlatformToolchain.cmake} |    0
 .../RunCMake/GeneratorPlatform/RunCMakeTest.cmake  |   16 ++++++++++++++
 .../GeneratorPlatform/TestPlatform-toolchain.cmake |    1 +
 .../TestPlatformToolchain-result.txt}              |    0
 .../TestPlatformToolchain-stderr.txt               |    9 ++++++++
 .../GeneratorPlatform/TestPlatformToolchain.cmake  |   16 ++++++++++++++
 .../TwoPlatforms-result.txt}                       |    0
 .../GeneratorPlatform/TwoPlatforms-stderr.txt      |    1 +
 .../{BadPlatform.cmake => TwoPlatforms.cmake}      |    0
 Tests/RunCMake/RunCMake.cmake                      |    2 +-
 Tests/VSExternalInclude/CMakeLists.txt             |    4 ++--
 28 files changed, 96 insertions(+), 14 deletions(-)
 create mode 100644 Tests/RunCMake/GeneratorPlatform/BadPlatform-toolchain.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorPlatform/BadPlatformToolchain-result.txt} (100%)
 copy Tests/RunCMake/GeneratorPlatform/{BadPlatform-stderr.txt => BadPlatformToolchain-stderr.txt} (100%)
 copy Tests/RunCMake/GeneratorPlatform/{BadPlatform.cmake => BadPlatformToolchain.cmake} (100%)
 create mode 100644 Tests/RunCMake/GeneratorPlatform/TestPlatform-toolchain.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorPlatform/TestPlatformToolchain-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorPlatform/TestPlatformToolchain-stderr.txt
 create mode 100644 Tests/RunCMake/GeneratorPlatform/TestPlatformToolchain.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => GeneratorPlatform/TwoPlatforms-result.txt} (100%)
 create mode 100644 Tests/RunCMake/GeneratorPlatform/TwoPlatforms-stderr.txt
 copy Tests/RunCMake/GeneratorPlatform/{BadPlatform.cmake => TwoPlatforms.cmake} (100%)


hooks/post-receive
-- 
CMake