[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1354-ge917c9e

[Stephen Kelly]

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  e917c9e1b76e888aa13e860e136a91abfe0b1ad2 (commit)
       via  f1fd3714a40327c461633b64d82f6815ed3e7817 (commit)
      from  3e45853194400320ddb8a78a78ba2fddf8d1be5f (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=e917c9e1b76e888aa13e860e136a91abfe0b1ad2
commit e917c9e1b76e888aa13e860e136a91abfe0b1ad2
Merge: 3e45853 f1fd371
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 20 17:15:35 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 17:15:35 2014 -0400

    Merge topic 'report-INTERFACE-type-in-conflict' into next
    
    f1fd3714 cmMakefile: Report type of INTERFACE library in conflict.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1fd3714a40327c461633b64d82f6815ed3e7817
commit f1fd3714a40327c461633b64d82f6815ed3e7817
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 18 00:09:40 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 20 22:09:32 2014 +0100

    cmMakefile: Report type of INTERFACE library in conflict.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f82acc8..dce71de 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4200,6 +4200,9 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
         case cmTarget::UTILITY:
           e << "a custom target ";
           break;
+        case cmTarget::INTERFACE_LIBRARY:
+          e << "an interface library ";
+          break;
         default: break;
         }
       e << "created in source directory \""

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

Summary of changes:
 Source/cmMakefile.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake