[Cmake-commits] CMake branch, next, updated. v2.8.12-4290-gfaecd27

[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  faecd27bf0897c4adab130bac70fa26926c28a24 (commit)
       via  17e9b25f49b51c30c65074961d456dd64b492010 (commit)
      from  3c138fc36734a655205018be3e2823de86a0b280 (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=faecd27bf0897c4adab130bac70fa26926c28a24
commit faecd27bf0897c4adab130bac70fa26926c28a24
Merge: 3c138fc 17e9b25
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 14:22:29 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 22 14:22:29 2013 -0400

    Merge topic 'output-CMP0022-entries' into next
    
    17e9b25 Change the message to report the link implementation.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17e9b25f49b51c30c65074961d456dd64b492010
commit 17e9b25f49b51c30c65074961d456dd64b492010
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 20:22:01 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 22 20:22:01 2013 +0200

    Change the message to report the link implementation.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 0433038..9e2234e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6519,7 +6519,7 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
                 "INTERFACE_LINK_LIBRARIES:\n  "
               << newLibraries
               << "\n"
-              << "Link interface" << ":\n  "
+              << "Link implementation:\n  "
               << oldLibraries << "\n";
             this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
             }
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-static-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-WARN-static-stderr.txt
index 8776aa9..e41133a 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN-static-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-static-stderr.txt
@@ -12,7 +12,7 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
     foo
 
-  Link interface:
+  Link implementation:
 
     bat
 

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

Summary of changes:
 Source/cmTarget.cxx                                |    2 +-
 .../CMP0022/CMP0022-WARN-static-stderr.txt         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake