[Cmake-commits] CMake branch, master, updated. v3.0.0-1347-ge187351

[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  e187351c5f7c1c1ef844df6be4d19bfd303266ae (commit)
       via  2c470b775ab54f565383c95200d16dc42d94fe17 (commit)
       via  de4f3e2c82a92a7dfc6305a09cc32d9d5c6e8c34 (commit)
       via  54bf5858cd4153f41a2414dbe8d1278268eccb58 (commit)
      from  49910f1a2c9819a848b8d3b4c15d970039d7f101 (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=e187351c5f7c1c1ef844df6be4d19bfd303266ae
commit e187351c5f7c1c1ef844df6be4d19bfd303266ae
Merge: 49910f1 2c470b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 9 10:02:45 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 9 10:02:45 2014 -0400

    Merge topic 'allow-OBJECT-library-extra-sources'
    
    2c470b77 add_library: Allow arbitrary non-linked sources in OBJECT libraries
    de4f3e2c Tests: Fix broken dependency in ObjectLibrary test
    54bf5858 Tests: Resolve TODO comment left in ObjectLibrary test


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

Summary of changes:
 Help/command/add_library.rst                       |    3 ++-
 .../dev/allow-OBJECT-library-extra-sources.rst     |    6 ++++++
 Source/cmGeneratorTarget.cxx                       |    7 ++-----
 Tests/ObjectLibrary/A/CMakeLists.txt               |   20 ++++++++++++++------
 Tests/ObjectLibrary/B/CMakeLists.txt               |    5 +----
 Tests/ObjectLibrary/CMakeLists.txt                 |    1 +
 .../ObjectLibrary/BadObjSource1-stderr.txt         |    3 ++-
 .../ObjectLibrary/BadObjSource2-stderr.txt         |    3 ++-
 8 files changed, 30 insertions(+), 18 deletions(-)
 create mode 100644 Help/release/dev/allow-OBJECT-library-extra-sources.rst


hooks/post-receive
-- 
CMake