From 81d2793e920a90a627ca47bfd68f24dacf27ca72 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 11 Sep 2013 22:28:32 +0200 Subject: Add differing target property content to policy CMP0022 warning List the contents of the INTERFACE_LINK_LIBRARIES and the old-style property. --- 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 deletion(-) 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. -- cgit v0.12