[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1572-g30a33b1

[Nils Gladitz]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  30a33b14529357de3d9bf1dab87ba79f1a46462d (commit)
       via  ceeee63f2e12665f6cdfff63286108cb5dd0dedc (commit)
      from  6e7e04278478b79fe6d8ecdc7a439090d0f9baf1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=30a33b14529357de3d9bf1dab87ba79f1a46462d
commit 30a33b14529357de3d9bf1dab87ba79f1a46462d
Merge: 6e7e042 ceeee63
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Mar 28 17:15:50 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 28 17:15:50 2014 -0400

    Merge topic 'fix_policy_diagnostics' into next
    
    ceeee63f Policies: fix additional diagnostics


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ceeee63f2e12665f6cdfff63286108cb5dd0dedc
commit ceeee63f2e12665f6cdfff63286108cb5dd0dedc
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Mar 28 22:12:10 2014 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Mar 28 22:12:10 2014 +0100

    Policies: fix additional diagnostics

diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 4d9935c..0a4f5c9 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 "
diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 91ca479..1c2e625 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -374,11 +374,14 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
         ? cmTarget::KeywordTLLSignature : cmTarget::PlainTLLSignature;
   if (!this->Target->PushTLLCommandTrace(sig))
     {
+    cmOStringStream e;
     const char *modal = 0;
     cmake::MessageType messageType = cmake::AUTHOR_WARNING;
     switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0023))
       {
       case cmPolicies::WARN:
+        e << this->Makefile->GetPolicies()
+          ->GetPolicyWarning(cmPolicies::CMP0023) << "\n";
         modal = "should";
       case cmPolicies::OLD:
         break;
@@ -391,14 +394,12 @@ cmTargetLinkLibrariesCommand::HandleLibrary(const std::string& lib,
 
       if(modal)
         {
-        cmOStringStream e;
         // If the sig is a keyword form and there is a conflict, the existing
         // form must be the plain form.
         const char *existingSig
                     = (sig == cmTarget::KeywordTLLSignature ? "plain"
                                                             : "keyword");
-        e << this->Makefile->GetPolicies()
-                              ->GetPolicyWarning(cmPolicies::CMP0023) << "\n"
+          e <<
             "The " << existingSig << " signature for target_link_libraries "
             "has already been used with the target \""
           << this->Target->GetName() << "\".  All uses of "

-----------------------------------------------------------------------

Summary of changes:
 Source/cmIncludeCommand.cxx             |    6 +++---
 Source/cmTargetLinkLibrariesCommand.cxx |    7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake