[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-422-gf70b225

[Brad King]

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, master has been updated
       via  f70b2253f65fd01223859c7391cabd25fce184bf (commit)
       via  77b581c2f004a36b2b62cc7c678abf51f92c76b5 (commit)
      from  242e13bfe622d80ca329119ae4027d739d7fa90f (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=f70b2253f65fd01223859c7391cabd25fce184bf
commit f70b2253f65fd01223859c7391cabd25fce184bf
Merge: 242e13b 77b581c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 1 11:06:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 1 11:06:17 2014 -0400

    Merge topic 'fix_policy_diagnostics'
    
    77b581c2 Policies: omit warnings about unset policies when they are actually set to NEW

diff --cc Source/cmMakefile.cxx
index dce71de,11559d9..2757564
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@@ -908,11 -911,8 +911,8 @@@ cmMakefile::AddCustomCommandToTarget(co
  
      if(issueMessage)
        {
-       cmOStringStream e;
-       e << (this->GetPolicies()
-         ->GetPolicyWarning(cmPolicies::CMP0040)) << "\n";
        e << "The target name \"" << target << "\" is unknown in this context.";
 -      IssueMessage(messageType, e.str().c_str());
 +      IssueMessage(messageType, e.str());
        }
  
        return;
diff --cc Source/cmTargetLinkLibrariesCommand.cxx
index 115a988,95a2cba..1c2e625
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@@ -119,12 -122,10 +122,10 @@@ bool cmTargetLinkLibrariesComman
        }
      if (modal)
        {
-       cmOStringStream e;
-       e << this->Makefile->GetPolicies()
-                             ->GetPolicyWarning(cmPolicies::CMP0039) << "\n"
+       e <<
          "Utility target \"" << this->Target->GetName() << "\" " << modal
          << " not be used as the target of a target_link_libraries call.";
 -      this->Makefile->IssueMessage(messageType, e.str().c_str());
 +      this->Makefile->IssueMessage(messageType, e.str());
        if(messageType == cmake::FATAL_ERROR)
          {
          return false;

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

Summary of changes:
 Source/cmAddCustomTargetCommand.cxx                     |    6 +++---
 Source/cmAddExecutableCommand.cxx                       |    6 +++---
 Source/cmAddLibraryCommand.cxx                          |   11 +++++++----
 Source/cmComputeTargetDepends.cxx                       |    7 ++++---
 Source/cmIncludeCommand.cxx                             |    6 +++---
 Source/cmMakefile.cxx                                   |    6 +++---
 Source/cmTarget.cxx                                     |    6 +++---
 Source/cmTargetLinkLibrariesCommand.cxx                 |   14 ++++++++------
 .../CMP0026/CMP0026-CONFIG-LOCATION-NEW-stderr.txt      |    4 ----
 .../CMP0026/CMP0026-LOCATION-CONFIG-NEW-stderr.txt      |    4 ----
 Tests/RunCMake/CMP0026/CMP0026-NEW-stderr.txt           |    4 ----
 Tests/RunCMake/CMP0037/CMP0037-NEW-colon-stderr.txt     |   15 ---------------
 Tests/RunCMake/CMP0037/CMP0037-NEW-reserved-stderr.txt  |   15 ---------------
 Tests/RunCMake/CMP0037/CMP0037-NEW-space-stderr.txt     |   15 ---------------
 Tests/RunCMake/CMP0039/CMP0039-NEW-stderr.txt           |    4 ----
 .../CMP0040/CMP0040-NEW-missing-target-stderr.txt       |    5 -----
 .../CMP0046/CMP0046-NEW-missing-dependency-stderr.txt   |    4 ----
 Tests/RunCMake/include/CMP0024-NEW-stderr.txt           |    4 ----
 .../target_link_libraries/CMP0023-NEW-2-stderr.txt      |    5 -----
 .../target_link_libraries/CMP0023-NEW-stderr.txt        |    5 -----
 20 files changed, 34 insertions(+), 112 deletions(-)


hooks/post-receive
-- 
CMake