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/cmTarget.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/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 17c8a4d..32aaccc 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -2581,11 +2581,14 @@ bool cmTarget::HandleLocationPropertyPolicy() const { return true; } + cmOStringStream e; const char *modal = 0; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch (this->Makefile->GetPolicyStatus(cmPolicies::CMP0026)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0026)) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -2598,9 +2601,6 @@ bool cmTarget::HandleLocationPropertyPolicy() const if (modal) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0026)) << "\n"; e << "The LOCATION property " << modal << " not be read from target \"" << this->GetName() << "\". Use the target name directly with " "add_custom_command, or use the generator expression $<TARGET_FILE>, " |