[Cmake-commits] CMake branch, next, updated. v2.8.12-4155-gd85d932

[Stephen Kelly]

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  d85d932aef31ee9d8572c0f94c213e1d851daa3b (commit)
       via  d04a0aec15b3e163f30cc9c18798aedd6dc3c478 (commit)
       via  620b0e92fce77ccdfc2f35485e31dcdf756962d5 (commit)
       via  2d4ce8054900216f554dede6dec843741e8c97f5 (commit)
       via  d6dd264671a10da9c942361b1559d757c35fa0ae (commit)
      from  b50003e1e121ccc19c3924c3927a9f5be23fd371 (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=d85d932aef31ee9d8572c0f94c213e1d851daa3b
commit d85d932aef31ee9d8572c0f94c213e1d851daa3b
Merge: b50003e d04a0ae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 18 12:57:47 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 18 12:57:47 2013 -0400

    Merge topic 'minor-cleanups' into next
    
    d04a0ae Remove unused variable.
    620b0e9 target_link_libraries(): Fix code snippet in documentation.
    2d4ce80 cmPolicies: Fix typo
    d6dd264 include(): Use lower case and () to refer to the include() command.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d04a0aec15b3e163f30cc9c18798aedd6dc3c478
commit d04a0aec15b3e163f30cc9c18798aedd6dc3c478
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Oct 18 17:07:59 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 18 18:52:02 2013 +0200

    Remove unused variable.

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b6182ab..cab7e7c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1990,7 +1990,6 @@ static void processIncludeDirectories(cmTarget *tgt,
             {
             case cmPolicies::WARN:
               {
-              cmOStringStream w;
               e << (mf->GetPolicies()
                     ->GetPolicyWarning(cmPolicies::CMP0021)) << "\n";
               messageType = cmake::AUTHOR_WARNING;

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=620b0e92fce77ccdfc2f35485e31dcdf756962d5
commit 620b0e92fce77ccdfc2f35485e31dcdf756962d5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 17 21:40:51 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 18 18:52:02 2013 +0200

    target_link_libraries(): Fix code snippet in documentation.
    
    The porting script seems to have made a mistake here.

diff --git a/Help/command/target_link_libraries.rst b/Help/command/target_link_libraries.rst
index a1e3e22..41265fd 100644
--- a/Help/command/target_link_libraries.rst
+++ b/Help/command/target_link_libraries.rst
@@ -59,10 +59,11 @@ for <target>:
 If an <item> is a library in a Mac OX framework, the Headers directory
 of the framework will also be processed as a "usage requirement".
 This has the same effect as passing the framework directory as an
-include directory.  target_link_libraries(<target>
+include directory.
 
 ::
 
+  target_link_libraries(<target>
                       <PRIVATE|PUBLIC|INTERFACE> <lib> ...
                       [<PRIVATE|PUBLIC|INTERFACE> <lib> ... ] ...])
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2d4ce8054900216f554dede6dec843741e8c97f5
commit 2d4ce8054900216f554dede6dec843741e8c97f5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Oct 17 19:15:52 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 18 18:52:01 2013 +0200

    cmPolicies: Fix typo
    
    Use American spelling: behaviour -> behavior.

diff --git a/Help/policy/CMP0017.rst b/Help/policy/CMP0017.rst
index c93e8b2..f74e6f0 100644
--- a/Help/policy/CMP0017.rst
+++ b/Help/policy/CMP0017.rst
@@ -11,7 +11,7 @@ the modules belonging to CMake always get those files included which
 they expect, and against which they were developed and tested.  In all
 other cases, the files found in CMAKE_MODULE_PATH still take
 precedence over the ones in the CMake module directory.  The OLD
-behaviour is to always prefer files from CMAKE_MODULE_PATH over files
+behavior is to always prefer files from CMAKE_MODULE_PATH over files
 from the CMake modules directory.
 
 This policy was introduced in CMake version 2.8.4.  CMake version

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d6dd264671a10da9c942361b1559d757c35fa0ae
commit d6dd264671a10da9c942361b1559d757c35fa0ae
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Oct 16 13:41:47 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Oct 18 18:51:10 2013 +0200

    include(): Use lower case and () to refer to the include() command.

diff --git a/Source/cmIncludeCommand.cxx b/Source/cmIncludeCommand.cxx
index 5b93171..e8ee33f 100644
--- a/Source/cmIncludeCommand.cxx
+++ b/Source/cmIncludeCommand.cxx
@@ -19,7 +19,7 @@ bool cmIncludeCommand
   if (args.size()< 1 || args.size() > 4)
     {
       this->SetError("called with wrong number of arguments.  "
-                     "Include only takes one file.");
+                     "include() only takes one file.");
       return false;
     }
   bool optional = false;

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

Summary of changes:
 Help/command/target_link_libraries.rst |    3 ++-
 Help/policy/CMP0017.rst                |    2 +-
 Source/cmIncludeCommand.cxx            |    2 +-
 Source/cmTarget.cxx                    |    1 -
 4 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake