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/cmAddLibraryCommand.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/cmAddLibraryCommand.cxx')
| -rw-r--r-- | Source/cmAddLibraryCommand.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmAddLibraryCommand.cxx b/Source/cmAddLibraryCommand.cxx index 009b1ca..e62a40e 100644 --- a/Source/cmAddLibraryCommand.cxx +++ b/Source/cmAddLibraryCommand.cxx @@ -214,11 +214,17 @@ bool cmAddLibraryCommand if (!nameOk) { cmake::MessageType messageType = cmake::AUTHOR_WARNING; + cmOStringStream e; bool issueMessage = false; switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0037)) { case cmPolicies::WARN: - issueMessage = type != cmTarget::INTERFACE_LIBRARY; + if(type != cmTarget::INTERFACE_LIBRARY) + { + e << (this->Makefile->GetPolicies() + ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; + issueMessage = true; + } case cmPolicies::OLD: break; case cmPolicies::NEW: @@ -229,9 +235,6 @@ bool cmAddLibraryCommand } if (issueMessage) { - cmOStringStream e; - e << (this->Makefile->GetPolicies() - ->GetPolicyWarning(cmPolicies::CMP0037)) << "\n"; e << "The target name \"" << libName << "\" is reserved or not valid for certain " "CMake features, such as generator expressions, and may result " |