summaryrefslogtreecommitdiffstats
path: root/Source/cmComputeTargetDepends.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-04-01 15:06:17 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-04-01 15:06:17 (GMT)
commitf70b2253f65fd01223859c7391cabd25fce184bf (patch)
tree4c3cdf1b623ee673e19b93503d30edb1bd59c03f /Source/cmComputeTargetDepends.cxx
parent242e13bfe622d80ca329119ae4027d739d7fa90f (diff)
parent77b581c2f004a36b2b62cc7c678abf51f92c76b5 (diff)
downloadCMake-f70b2253f65fd01223859c7391cabd25fce184bf.zip
CMake-f70b2253f65fd01223859c7391cabd25fce184bf.tar.gz
CMake-f70b2253f65fd01223859c7391cabd25fce184bf.tar.bz2
Merge topic 'fix_policy_diagnostics'
77b581c2 Policies: omit warnings about unset policies when they are actually set to NEW
Diffstat (limited to 'Source/cmComputeTargetDepends.cxx')
-rw-r--r--Source/cmComputeTargetDepends.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index b4dbce7..5ba843f 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -349,9 +349,12 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
cmMakefile *makefile = depender->GetMakefile();
cmake::MessageType messageType = cmake::AUTHOR_WARNING;
bool issueMessage = false;
+ cmOStringStream e;
switch(depender->GetPolicyStatusCMP0046())
{
case cmPolicies::WARN:
+ e << (makefile->GetPolicies()
+ ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n";
issueMessage = true;
case cmPolicies::OLD:
break;
@@ -364,9 +367,7 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
if(issueMessage)
{
cmake* cm = this->GlobalGenerator->GetCMakeInstance();
- cmOStringStream e;
- e << (makefile->GetPolicies()
- ->GetPolicyWarning(cmPolicies::CMP0046)) << "\n";
+
e << "The dependency target \"" << dependee_name
<< "\" of target \"" << depender->GetName() << "\" does not exist.";