[Cmake-commits] CMake branch, master, updated. v3.6.0-rc3-260-g1b021a6

[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  1b021a64f8bf4d9544acb18628e3821f61f49e10 (commit)
       via  15b3f6f0f187ab12c29e437f737356bed13d977b (commit)
      from  7287893d411dde3b9afc6a4c8896dd9d15db9e04 (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=1b021a64f8bf4d9544acb18628e3821f61f49e10
commit 1b021a64f8bf4d9544acb18628e3821f61f49e10
Merge: 7287893 15b3f6f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 28 09:06:34 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 28 09:06:34 2016 -0400

    Merge topic 'ninja-no-rsp-for-rc'
    
    15b3f6f0 ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC files


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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx                               |    6 ++++--
 Tests/CMakeLists.txt                                            |    3 +++
 Tests/VSResourceNinjaForceRSP/CMakeLists.txt                    |    7 +++++++
 Tests/{VSResource => VSResourceNinjaForceRSP}/lib.cpp           |    0
 .../CompatibleInterface => VSResourceNinjaForceRSP}/main.cpp    |    3 ++-
 Tests/{VSResource/lib.rc => VSResourceNinjaForceRSP/test.rc}    |    0
 6 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 Tests/VSResourceNinjaForceRSP/CMakeLists.txt
 copy Tests/{VSResource => VSResourceNinjaForceRSP}/lib.cpp (100%)
 copy Tests/{RunCMake/CompatibleInterface => VSResourceNinjaForceRSP}/main.cpp (63%)
 copy Tests/{VSResource/lib.rc => VSResourceNinjaForceRSP/test.rc} (100%)


hooks/post-receive
-- 
CMake