[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6758-gbe21e65

[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  be21e65cfb8cf7caabdfcb067edf5ac2b1509a7f (commit)
       via  6da754038abe3744718b2a064a94d6c7f4405af5 (commit)
      from  eda60514724810f1b492033b2594c011502863f9 (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=be21e65cfb8cf7caabdfcb067edf5ac2b1509a7f
commit be21e65cfb8cf7caabdfcb067edf5ac2b1509a7f
Merge: eda6051 6da7540
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 6 12:46:35 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 6 12:46:35 2014 -0500

    Merge topic 'minor-cleanups' into next
    
    6da7540 Remove unneeded length check.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6da754038abe3744718b2a064a94d6c7f4405af5
commit 6da754038abe3744718b2a064a94d6c7f4405af5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jan 6 18:44:02 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jan 6 18:44:25 2014 +0100

    Remove unneeded length check.
    
    cmHasLiteralSuffix includes such a check already.

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 3329f8a..12bb807 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1151,8 +1151,8 @@ void cmFindPackageCommand::AddPrefixesSystemEnvironment()
       std::string const& d = *i;
 
       // If the path is a PREFIX/bin case then add its parent instead.
-      if((d.size() >= 4 && cmHasLiteralSuffix(d, "/bin")) ||
-         (d.size() >= 5 && cmHasLiteralSuffix(d, "/sbin")))
+      if((cmHasLiteralSuffix(d, "/bin")) ||
+         (cmHasLiteralSuffix(d, "/sbin")))
         {
         this->AddPathInternal(cmSystemTools::GetFilenamePath(d), EnvPath);
         }

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

Summary of changes:
 Source/cmFindPackageCommand.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake