[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3053-g6868b13

[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, next has been updated
       via  6868b1342dca01eb67257848d878afcf8db1a2cb (commit)
       via  635e19d6077b8cbe6e657fb8bcc33a640c03bff6 (commit)
       via  0a44fa4c6c87c76d2adfa1edf68b9f2cfe2096cb (commit)
      from  68cfcb22d88b9b2da6a53c9d098194fa66ace12c (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=6868b1342dca01eb67257848d878afcf8db1a2cb
commit 6868b1342dca01eb67257848d878afcf8db1a2cb
Merge: 68cfcb2 635e19d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 11 09:08:34 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 11 09:08:34 2013 -0400

    Merge topic 'update-kwsys' into next
    
    635e19d Merge branch 'upstream-kwsys' into update-kwsys
    0a44fa4 KWSys 2013-07-10 (beef6819)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=635e19d6077b8cbe6e657fb8bcc33a640c03bff6
commit 635e19d6077b8cbe6e657fb8bcc33a640c03bff6
Merge: 4dc515f 0a44fa4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 11 09:04:05 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 11 09:04:05 2013 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a44fa4c6c87c76d2adfa1edf68b9f2cfe2096cb
commit 0a44fa4c6c87c76d2adfa1edf68b9f2cfe2096cb
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Wed Jul 10 08:16:24 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 11 09:03:59 2013 -0400

    KWSys 2013-07-10 (beef6819)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ beef6819 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' f6c4c247..beef6819
    Brad King (1):
          beef6819 SystemTools: Implement IsSubDirectory without loop
    
    Change-Id: Ifab0c0384c7fbf1f9fc934918573a49b38f7bc0a

diff --git a/SystemTools.cxx b/SystemTools.cxx
index 4d5af5e..935b836 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4261,17 +4261,13 @@ bool SystemTools::IsSubDirectory(const char* cSubdir, const char* cDir)
     }
   kwsys_stl::string subdir = cSubdir;
   kwsys_stl::string dir = cDir;
+  SystemTools::ConvertToUnixSlashes(subdir);
   SystemTools::ConvertToUnixSlashes(dir);
-  kwsys_stl::string path = subdir;
-  do
+  if(subdir.size() > dir.size() && subdir[dir.size()] == '/')
     {
-    path = SystemTools::GetParentDirectory(path.c_str());
-    if(SystemTools::ComparePath(dir.c_str(), path.c_str()))
-      {
-      return true;
-      }
+    std::string s = subdir.substr(0, dir.size());
+    return SystemTools::ComparePath(s.c_str(), dir.c_str());
     }
-  while ( path.size() > dir.size() );
   return false;
 }
 

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

Summary of changes:
 Source/kwsys/SystemTools.cxx |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake