diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-02 12:47:45 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-11-02 12:47:45 -0400 |
| commit | 4b0cfa7004c1a2f5069affa4e673a24d9cf6a075 (patch) | |
| tree | edd3dad13d7af0e7ebaa5499ccbd1a474ac557ed | |
| parent | 239b0c6b0ed821fd012a2a980961b9a9d43793e5 (diff) | |
| parent | 0b3b3368fb8ee712aa06fcb2b9c6e288905ca6ae (diff) | |
| download | cmake-4b0cfa7004c1a2f5069affa4e673a24d9cf6a075.tar.gz | |
Merge branch 'output-CMP0022-entries' into policy-CMP0022-fixes
| -rw-r--r-- | Source/cmTarget.cxx | 27 | ||||
| -rw-r--r-- | Tests/RunCMake/CMP0022/CMP0022-WARN-static-stderr.txt | 9 |
2 files changed, 35 insertions, 1 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index c9095df80d..779b239dd4 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 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.$ |