[Cmake-commits] CMake branch, next, updated. v3.0.0-4095-g436841e

[Ben Boeckel]

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, next has been updated
       via  436841e506cc7590c7558dcd0d38acb1532aaac3 (commit)
       via  5ca1d3d59c9a0c7df7db335fe225896480e4873f (commit)
       via  6d1ad670771271bbdd7e3ff3bfa19474049cc139 (commit)
      from  3ecd1347b54bbfa2745880de9631f86ae4b90305 (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=436841e506cc7590c7558dcd0d38acb1532aaac3
commit 436841e506cc7590c7558dcd0d38acb1532aaac3
Merge: 3ecd134 5ca1d3d
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jul 3 10:24:19 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 3 10:24:19 2014 -0400

    Merge topic 'dev/export-from-obj-libs' into next
    
    5ca1d3d5 GenerateExportHeader: support exporting from OBJECT libraries
    6d1ad670 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ca1d3d59c9a0c7df7db335fe225896480e4873f
commit 5ca1d3d59c9a0c7df7db335fe225896480e4873f
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jul 3 10:23:40 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Thu Jul 3 10:23:40 2014 -0400

    GenerateExportHeader: support exporting from OBJECT libraries

diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake
index 66d300a..f00b577 100644
--- a/Modules/GenerateExportHeader.cmake
+++ b/Modules/GenerateExportHeader.cmake
@@ -363,6 +363,7 @@ function(GENERATE_EXPORT_HEADER TARGET_LIBRARY)
   get_property(type TARGET ${TARGET_LIBRARY} PROPERTY TYPE)
   if(NOT ${type} STREQUAL "STATIC_LIBRARY"
       AND NOT ${type} STREQUAL "SHARED_LIBRARY"
+      AND NOT ${type} STREQUAL "OBJECT_LIBRARY"
       AND NOT ${type} STREQUAL "MODULE_LIBRARY")
     message(WARNING "This macro can only be used with libraries")
     return()

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

Summary of changes:
 Modules/GenerateExportHeader.cmake |    1 +
 Source/CMakeVersion.cmake          |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake