From 0b3b3368fb8ee712aa06fcb2b9c6e288905ca6ae Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Tue, 22 Oct 2013 18:05:00 +0200
Subject: 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).
---
 Source/cmTarget.cxx                                | 27 +++++++++++++++++++++-
 .../CMP0022/CMP0022-WARN-static-stderr.txt         |  9 ++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ac655da128..9e2234e305 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 41d132cc0d..e41133aa12 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.$
-- 
cgit v1.2.1