[Cmake-commits] CMake branch, master, updated. v3.6.1-754-g918cb5b

[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  918cb5b1f095cc05a8823fa218a59edf0e536384 (commit)
       via  048d1adb4ede50e49dce00873a5961e424e149f9 (commit)
      from  57d121fbb1f2e9e2ac0622dd4049dedc3968d894 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=918cb5b1f095cc05a8823fa218a59edf0e536384
commit 918cb5b1f095cc05a8823fa218a59edf0e536384
Merge: 57d121f 048d1ad
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 30 09:29:40 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 30 09:29:40 2016 -0400

    Merge topic 'ninja-add_custom_command-depfile'
    
    048d1adb add_custom_command: Add DEPFILE option for Ninja


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

Summary of changes:
 Help/command/add_custom_command.rst                 |    7 +++++++
 .../dev/ninja-add_custom_command-depfile.rst        |    6 ++++++
 Source/cmAddCustomCommandCommand.cxx                |   19 ++++++++++++++++---
 Source/cmCustomCommand.cxx                          |   10 ++++++++++
 Source/cmCustomCommand.h                            |    5 +++++
 Source/cmGlobalNinjaGenerator.cxx                   |   10 ++++++----
 Source/cmGlobalNinjaGenerator.h                     |    3 ++-
 Source/cmLocalNinjaGenerator.cxx                    |    3 ++-
 Source/cmMakefile.cxx                               |   10 ++++++----
 Source/cmMakefile.h                                 |   18 ++++++++----------
 Source/cmNinjaUtilityTargetGenerator.cxx            |    2 +-
 .../CustomCommandDepfile-ERROR-result.txt}          |    0
 .../Make/CustomCommandDepfile-ERROR-stderr.txt      |    5 +++++
 .../CustomCommandDepfile-ERROR.cmake}               |    7 +------
 Tests/RunCMake/Make/RunCMakeTest.cmake              |    2 ++
 .../RunCMake/Ninja/CustomCommandDepfile-check.cmake |    5 +++++
 ...ngDirectory.cmake => CustomCommandDepfile.cmake} |    4 +---
 Tests/RunCMake/Ninja/RunCMakeTest.cmake             |    2 ++
 18 files changed, 85 insertions(+), 33 deletions(-)
 create mode 100644 Help/release/dev/ninja-add_custom_command-depfile.rst
 copy Tests/RunCMake/{Android/BadSYSROOT-result.txt => Make/CustomCommandDepfile-ERROR-result.txt} (100%)
 create mode 100644 Tests/RunCMake/Make/CustomCommandDepfile-ERROR-stderr.txt
 copy Tests/RunCMake/{Ninja/CustomCommandWorkingDirectory.cmake => Make/CustomCommandDepfile-ERROR.cmake} (54%)
 create mode 100644 Tests/RunCMake/Ninja/CustomCommandDepfile-check.cmake
 copy Tests/RunCMake/Ninja/{CustomCommandWorkingDirectory.cmake => CustomCommandDepfile.cmake} (84%)


hooks/post-receive
-- 
CMake