[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4133-g0b4389f

[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  0b4389f4042d39b8b0af5c4c6791b1aa99de3fe2 (commit)
       via  81d2793e920a90a627ca47bfd68f24dacf27ca72 (commit)
      from  caab0d003028d19f74f3388cb9ceca2d7a60582e (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=0b4389f4042d39b8b0af5c4c6791b1aa99de3fe2
commit 0b4389f4042d39b8b0af5c4c6791b1aa99de3fe2
Merge: caab0d0 81d2793
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 11 16:36:45 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 11 16:36:45 2013 -0400

    Merge topic 'print-CMP0022-content-conflict' into next
    
    81d2793 Add differing target property content to policy CMP0022 warning


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81d2793e920a90a627ca47bfd68f24dacf27ca72
commit 81d2793e920a90a627ca47bfd68f24dacf27ca72
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Sep 11 22:28:32 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Sep 11 22:28:32 2013 +0200

    Add differing target property content to policy CMP0022 warning
    
    List the contents of the INTERFACE_LINK_LIBRARIES and the old-style
    property.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 147c332..ce0d0f2 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6443,7 +6443,13 @@ bool cmTarget::ComputeLinkInterface(const char* config, LinkInterface& iface,
                 ->GetPolicyWarning(cmPolicies::CMP0022)) << "\n"
             << "Target \"" << this->GetName() << "\" has a "
               "INTERFACE_LINK_LIBRARIES property which differs from its "
-            << linkIfaceProp << " properties.";
+            << linkIfaceProp << " properties."
+              "\n"
+              "INTERFACE_LINK_LIBRARIES:\n  "
+            << newExplicitLibraries
+            << "\n"
+            << linkIfaceProp << ":\n  "
+            << explicitLibraries << "\n";
           this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
           }
           // Fall through
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-WARN-stderr.txt
index 29103c9..93c0ab3 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-stderr.txt
@@ -5,4 +5,13 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Target "bar" has a INTERFACE_LINK_LIBRARIES property which differs from its
   LINK_INTERFACE_LIBRARIES properties.
+
+  INTERFACE_LINK_LIBRARIES:
+
+    foo
+
+  LINK_INTERFACE_LIBRARIES:
+
+    bat
+
 This warning is for project developers.  Use -Wno-dev to suppress it.$
diff --git a/Tests/RunCMake/CMP0022/CMP0022-WARN-tll-stderr.txt b/Tests/RunCMake/CMP0022/CMP0022-WARN-tll-stderr.txt
index 5a5ad27..6370b24 100644
--- a/Tests/RunCMake/CMP0022/CMP0022-WARN-tll-stderr.txt
+++ b/Tests/RunCMake/CMP0022/CMP0022-WARN-tll-stderr.txt
@@ -5,4 +5,13 @@ CMake Warning \(dev\) in CMakeLists.txt:
 
   Target "bar" has a INTERFACE_LINK_LIBRARIES property which differs from its
   LINK_INTERFACE_LIBRARIES properties.
+
+  INTERFACE_LINK_LIBRARIES:
+
+    foo
+
+  LINK_INTERFACE_LIBRARIES:
+
+    bat
+
 This warning is for project developers.  Use -Wno-dev to suppress it.

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

Summary of changes:
 Source/cmTarget.cxx                                |    8 +++++++-
 Tests/RunCMake/CMP0022/CMP0022-WARN-stderr.txt     |    9 +++++++++
 Tests/RunCMake/CMP0022/CMP0022-WARN-tll-stderr.txt |    9 +++++++++
 3 files changed, 25 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake