[Cmake-commits] CMake branch, next, updated. v2.8.12-4320-gfacc2bf

[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, next has been updated
       via  facc2bf39530d688b6ff24c7ba481b47bdc16842 (commit)
       via  0b3b3368fb8ee712aa06fcb2b9c6e288905ca6ae (commit)
      from  bc1f2e13f7aa2190a7f8d63ae3327474d947efd2 (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=facc2bf39530d688b6ff24c7ba481b47bdc16842
commit facc2bf39530d688b6ff24c7ba481b47bdc16842
Merge: bc1f2e1 0b3b336
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 23 08:19:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 23 08:19:00 2013 -0400

    Merge topic 'output-CMP0022-entries' into next
    
    0b3b336 CMP0022: Output link interface mismatch for static library warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b3b3368fb8ee712aa06fcb2b9c6e288905ca6ae
commit 0b3b3368fb8ee712aa06fcb2b9c6e288905ca6ae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 18:05:00 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 23 08:18:02 2013 -0400

    CMP0022: Output link interface mismatch for static library warning
    
    Other warnings for the same policy already have similar output since
    commit 81d2793e (Add differing target property content to policy CMP0022
    warning, 2013-09-11).

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ac655da..9e2234e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6488,6 +6488,25 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
           {
           case cmPolicies::WARN:
             {
+            std::string oldLibraries;
+            std::string newLibraries;
+            const char *sep = "";
+            for(std::vector<std::string>::const_iterator it
+                = impl->Libraries.begin(); it != impl->Libraries.end(); ++it)
+              {
+              oldLibraries += sep;
+              oldLibraries += *it;
+              sep = ";";
+              }
+            sep = "";
+            for(std::vector<std::string>::const_iterator it
+                = ifaceLibs.begin(); it != ifaceLibs.end(); ++it)
+              {
+              newLibraries += sep;
+              newLibraries += *it;
+              sep = ";";
+              }
+
             cmOStringStream w;
             w << (this->Makefile->GetPolicies()
                   ->GetPolicyWarning(cmPolicies::CMP0022)) << "\n"
@@ -6495,7 +6514,13 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
                 "INTERFACE_LINK_LIBRARIES property.  This should be preferred "
                 "as the source of the link interface for this library.  "
                 "Ignoring the property and using the link implementation "
-                "as the link interface instead.";
+                "as the link interface instead."
+                "\n"
+                "INTERFACE_LINK_LIBRARIES:\n  "
+              << newLibraries
+              << "\n"
+              << "Link implementation:\n  "
+              << oldLibraries << "\n";
             this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
             }
             // Fall through
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-static-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-WARN-static-stderr.txt
index 41d132c..e41133a 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN-static-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-static-stderr.txt
@@ -7,4 +7,13 @@ CMake Warning \(dev\) in CMakeLists.txt:
   should be preferred as the source of the link interface for this library.
   Ignoring the property and using the link implementation as the link
   interface instead.
+
+  INTERFACE_LINK_LIBRARIES:
+
+    foo
+
+  Link implementation:
+
+    bat
+
 This warning is for project developers.  Use -Wno-dev to suppress it.$

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

Summary of changes:


hooks/post-receive
-- 
CMake