[Cmake-commits] CMake branch, next, updated. v2.8.12-4281-g5d84086

[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  5d84086774c54b8b30834a291a7fde11500ba3c7 (commit)
       via  54c44458fa5b0775bd36273334dc836d6eb0b9cf (commit)
      from  bf6b6db305141cdb9ee90b5196e9bc2279e7e4d3 (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=5d84086774c54b8b30834a291a7fde11500ba3c7
commit 5d84086774c54b8b30834a291a7fde11500ba3c7
Merge: bf6b6db 54c4445
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 12:07:06 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 22 12:07:06 2013 -0400

    Merge topic 'output-CMP0022-entries' into next
    
    54c4445 Output link interface mismatch with CMP0022 warning.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54c44458fa5b0775bd36273334dc836d6eb0b9cf
commit 54c44458fa5b0775bd36273334dc836d6eb0b9cf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 18:05:00 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 22 18:05:00 2013 +0200

    Output link interface mismatch with CMP0022 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..0433038 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 interface" << ":\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..8776aa9 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 interface:
+
+    bat
+
 This warning is for project developers.  Use -Wno-dev to suppress it.$

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

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


hooks/post-receive
-- 
CMake