diff options
author | Nils Gladitz <nilsgladitz@gmail.com> | 2014-03-28 20:38:10 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-03-31 13:45:10 (GMT) |
commit | 77b581c2f004a36b2b62cc7c678abf51f92c76b5 (patch) | |
tree | 38d8a72a1d631f6a9b5cd30ab9ab14a256e7826a /Source/cmIncludeCommand.cxx | |
parent | a48de7d8506325e7f27c9dada578744e1ff3fb35 (diff) | |
download | CMake-77b581c2f004a36b2b62cc7c678abf51f92c76b5.zip CMake-77b581c2f004a36b2b62cc7c678abf51f92c76b5.tar.gz CMake-77b581c2f004a36b2b62cc7c678abf51f92c76b5.tar.bz2 |
Policies: omit warnings about unset policies when they are actually set to NEW
Diffstat (limited to 'Source/cmIncludeCommand.cxx')
-rw-r--r-- | Source/cmIncludeCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx index e8ee33f..fbcbc75 100644 --- a/Source/cmIncludeCommand.cxx +++ b/Source/cmIncludeCommand.cxx @@ -98,11 +98,14 @@ bool cmIncludeCommand if (gg->IsExportedTargetsFile(fname_abs)) { const char *modal = 0; + cmOStringStream e; cmake::MessageType messageType = cmake::AUTHOR_WARNING; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0024)) { case cmPolicies::WARN: + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0024)) << "\n"; modal = "should"; case cmPolicies::OLD: break; @@ -114,9 +117,6 @@ bool cmIncludeCommand } if (modal) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0024)) << "\n"; e << "The file\n " << fname_abs << "\nwas generated by the export() " "command. It " << modal << " not be used as the argument to the " "include() command. Use ALIAS targets instead to refer to targets " |