summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-02 16:47:45 (GMT)
committerBrad King <brad.king@kitware.com>2013-11-02 16:47:45 (GMT)
commit4b0cfa7004c1a2f5069affa4e673a24d9cf6a075 (patch)
treeedd3dad13d7af0e7ebaa5499ccbd1a474ac557ed /Source/cmTarget.cxx
parent239b0c6b0ed821fd012a2a980961b9a9d43793e5 (diff)
parent0b3b3368fb8ee712aa06fcb2b9c6e288905ca6ae (diff)
downloadCMake-4b0cfa7004c1a2f5069affa4e673a24d9cf6a075.zip
CMake-4b0cfa7004c1a2f5069affa4e673a24d9cf6a075.tar.gz
CMake-4b0cfa7004c1a2f5069affa4e673a24d9cf6a075.tar.bz2
Merge branch 'output-CMP0022-entries' into policy-CMP0022-fixes
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx27
1 files changed, 26 insertions, 1 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index c9095df..779b239 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -6493,6 +6493,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"
@@ -6500,7 +6519,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