[Cmake-commits] CMake branch, master, updated. v3.1.0-rc2-312-g0f19208

[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  0f192080761529518128ee697d477ab5ec2e7ea8 (commit)
       via  557aef0b94c86d13e802e6e8e34a491304d7be2f (commit)
       via  e15a7075b58aef6fe7b6eb56f810d0f33bc31feb (commit)
      from  c5ac0fce5cf1020f661418eb1dc1f35c8f3207ed (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=0f192080761529518128ee697d477ab5ec2e7ea8
commit 0f192080761529518128ee697d477ab5ec2e7ea8
Merge: c5ac0fc 557aef0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 25 10:18:16 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 25 10:18:16 2014 -0500

    Merge topic 'custom-command-byproducts'
    
    557aef0b ExternalProject: Add options to specify BYPRODUCTS (#14963)
    e15a7075 Add an option for explicit BYPRODUCTS of custom commands (#14963)


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

Summary of changes:
 Help/command/add_custom_command.rst                |   23 ++++
 Help/command/add_custom_target.rst                 |   22 ++++
 Modules/ExternalProject.cmake                      |   13 ++
 Source/cmAddCustomCommandCommand.cxx               |   26 +++-
 Source/cmAddCustomTargetCommand.cxx                |   29 ++++-
 Source/cmCPluginAPI.cxx                            |    3 +-
 Source/cmCustomCommand.cxx                         |   10 ++
 Source/cmCustomCommand.h                           |    5 +
 Source/cmCustomCommandGenerator.cxx                |    6 +
 Source/cmCustomCommandGenerator.h                  |    1 +
 Source/cmGlobalGenerator.cxx                       |    5 +-
 Source/cmGlobalVisualStudio8Generator.cxx          |    3 +-
 Source/cmGlobalXCodeGenerator.cxx                  |    3 +
 Source/cmLocalNinjaGenerator.cxx                   |   10 +-
 Source/cmLocalVisualStudio6Generator.cxx           |    4 +-
 Source/cmLocalVisualStudioGenerator.cxx            |    4 +-
 Source/cmMakefile.cxx                              |   70 +++++++++--
 Source/cmMakefile.h                                |   13 +-
 Source/cmNinjaNormalTargetGenerator.cxx            |   17 ++-
 Source/cmNinjaTargetGenerator.cxx                  |    3 +
 Source/cmNinjaUtilityTargetGenerator.cxx           |   21 +++-
 Source/cmQtAutoGenerators.cxx                      |    7 +-
 Tests/CMakeLists.txt                               |    2 +
 Tests/CustomCommand/CMakeLists.txt                 |    1 +
 Tests/CustomCommandByproducts/CMakeLists.txt       |  127 ++++++++++++++++++++
 .../CustomCommandByproducts.c                      |   23 ++++
 .../External/CMakeLists.txt                        |    4 +
 .../External/ExternalLibrary.c                     |    1 +
 .../ProducerExe.c}                                 |    0
 Tests/CustomCommandByproducts/byproduct1.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct2.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct3.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct4.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct5.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct6.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct7.c.in      |    1 +
 Tests/CustomCommandByproducts/byproduct8.c.in      |    1 +
 Tests/CustomCommandByproducts/ninja-check.cmake    |   20 +++
 .../RunCMake/add_custom_command/RunCMakeTest.cmake |    1 +
 .../SourceByproducts-result.txt}                   |    0
 .../add_custom_command/SourceByproducts-stderr.txt |    4 +
 .../add_custom_command/SourceByproducts.cmake      |    1 +
 .../ByproductsNoCommand-result.txt}                |    0
 .../ByproductsNoCommand-stderr.txt                 |    4 +
 .../add_custom_target/ByproductsNoCommand.cmake    |    1 +
 .../RunCMake/add_custom_target/RunCMakeTest.cmake  |    1 +
 46 files changed, 466 insertions(+), 30 deletions(-)
 create mode 100644 Tests/CustomCommandByproducts/CMakeLists.txt
 create mode 100644 Tests/CustomCommandByproducts/CustomCommandByproducts.c
 create mode 100644 Tests/CustomCommandByproducts/External/CMakeLists.txt
 create mode 100644 Tests/CustomCommandByproducts/External/ExternalLibrary.c
 copy Tests/{CMakeOnly/LinkInterfaceLoop/main.c => CustomCommandByproducts/ProducerExe.c} (100%)
 create mode 100644 Tests/CustomCommandByproducts/byproduct1.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct2.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct3.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct4.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct5.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct6.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct7.c.in
 create mode 100644 Tests/CustomCommandByproducts/byproduct8.c.in
 create mode 100644 Tests/CustomCommandByproducts/ninja-check.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_command/SourceByproducts-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_command/SourceByproducts-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_command/SourceByproducts.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => add_custom_target/ByproductsNoCommand-result.txt} (100%)
 create mode 100644 Tests/RunCMake/add_custom_target/ByproductsNoCommand-stderr.txt
 create mode 100644 Tests/RunCMake/add_custom_target/ByproductsNoCommand.cmake


hooks/post-receive
-- 
CMake