diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-01 15:06:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-04-01 15:06:17 (GMT) |
| commit | f70b2253f65fd01223859c7391cabd25fce184bf (patch) | |
| tree | 4c3cdf1b623ee673e19b93503d30edb1bd59c03f /Source/cmMakefile.cxx | |
| parent | 242e13bfe622d80ca329119ae4027d739d7fa90f (diff) | |
| parent | 77b581c2f004a36b2b62cc7c678abf51f92c76b5 (diff) | |
| download | CMake-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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index dce71de..2757564 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -893,9 +893,12 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target, { cmake::MessageType messageType = cmake::AUTHOR_WARNING; bool issueMessage = false; + cmOStringStream e; switch(this->GetPolicyStatus(cmPolicies::CMP0040)) { case cmPolicies::WARN: + e << (this->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n"; issueMessage = true; case cmPolicies::OLD: break; @@ -908,9 +911,6 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target, if(issueMessage) { - cmOStringStream e; - e << (this->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n"; e << "The target name \"" << target << "\" is unknown in this context."; IssueMessage(messageType, e.str()); } |