[Cmake-commits] CMake branch, master, updated. v3.1.0-580-g661622f

[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  661622f011810093433afa5c9a4795b3d2f19070 (commit)
       via  07fc7b75ef981300e7d873091ee90083b18d1c4a (commit)
       via  fdbfcfdf0173c34845e495f4c0bd407faafc45b4 (commit)
      from  c20d3d319cb97da5793beebe42a80361b2d247c4 (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=661622f011810093433afa5c9a4795b3d2f19070
commit 661622f011810093433afa5c9a4795b3d2f19070
Merge: c20d3d3 07fc7b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 24 06:38:24 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 24 06:38:24 2014 -0500

    Merge topic 'ninja-fix-subdir-objlib-languages'
    
    07fc7b75 Tests: Test using objects from a language enabled in a subdirectory (#15325)
    fdbfcfdf Ninja: Generate rules only for languages compiled in a target (#15325)


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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |   17 +++++++++++++++--
 Tests/CMakeLists.txt                    |    1 +
 Tests/CxxSubdirC/CMakeLists.txt         |    4 ++++
 Tests/CxxSubdirC/Cdir/CMakeLists.txt    |    2 ++
 Tests/CxxSubdirC/Cdir/Cobj.c            |    1 +
 Tests/CxxSubdirC/main.cxx               |    2 ++
 6 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 Tests/CxxSubdirC/CMakeLists.txt
 create mode 100644 Tests/CxxSubdirC/Cdir/CMakeLists.txt
 create mode 100644 Tests/CxxSubdirC/Cdir/Cobj.c
 create mode 100644 Tests/CxxSubdirC/main.cxx


hooks/post-receive
-- 
CMake