diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-02 13:38:28 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-02 13:38:28 (GMT) |
| commit | f180fc89255bdd72e5d1b49ba7e7cc8dcb77c72e (patch) | |
| tree | dde34bd6a0507504400c4a80ba2dc519c9ca96dc /Source/cmIncludeCommand.cxx | |
| parent | b783b99f8a4bafd3e53bcdfc045b3fc2cd225875 (diff) | |
| parent | 77b581c2f004a36b2b62cc7c678abf51f92c76b5 (diff) | |
| download | CMake-f180fc89255bdd72e5d1b49ba7e7cc8dcb77c72e.zip CMake-f180fc89255bdd72e5d1b49ba7e7cc8dcb77c72e.tar.gz CMake-f180fc89255bdd72e5d1b49ba7e7cc8dcb77c72e.tar.bz2 | |
Merge branch 'fix_policy_diagnostics' into release
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 " |