[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2834-g264823f

[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  264823f3fc02fbf7db1fd93546ad40718e1951e4 (commit)
       via  0c04428d04d4a5043aaad54528c4ae6857ddf133 (commit)
       via  327c982faf6a9f119b6547c099a6bbf2ee82e517 (commit)
       via  c8b34729d90366a7dfee7b0d4a3df1ebfd7cdeab (commit)
      from  6ceeff297bd1b06a6b4141fdccdd76447de82a0f (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=264823f3fc02fbf7db1fd93546ad40718e1951e4
commit 264823f3fc02fbf7db1fd93546ad40718e1951e4
Merge: 6ceeff2 0c04428
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 26 16:09:23 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 26 16:09:23 2013 -0400

    Merge topic 'update-kwsys' into next
    
    0c04428 Merge branch 'upstream-kwsys' into update-kwsys
    327c982 KWSys 2013-04-25 (709fb5c1)
    c8b3472 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c04428d04d4a5043aaad54528c4ae6857ddf133
commit 0c04428d04d4a5043aaad54528c4ae6857ddf133
Merge: c8b3472 327c982
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 26 16:08:35 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 26 16:08:35 2013 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=327c982faf6a9f119b6547c099a6bbf2ee82e517
commit 327c982faf6a9f119b6547c099a6bbf2ee82e517
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Thu Apr 25 08:58:57 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 26 16:08:25 2013 -0400

    KWSys 2013-04-25 (709fb5c1)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 709fb5c1 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 2d263bc3..709fb5c1
    Brad King (1):
          709fb5c1 SystemTools: Fix FileIsDirectory for Windows drive letter roots
    
    Change-Id: Ie71305c3787806599f79a3cc7096e74e7237e986

diff --git a/SystemTools.cxx b/SystemTools.cxx
index 22bf193..d816b17 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2741,11 +2741,11 @@ bool SystemTools::FileIsDirectory(const char* name)
     return false;
     }
 
-  // Remove any trailing slash from the name.
+  // Remove any trailing slash from the name except in a root component.
   char buffer[KWSYS_SYSTEMTOOLS_MAXPATH];
   size_t last = length-1;
   if(last > 0 && (name[last] == '/' || name[last] == '\\')
-    && strcmp(name, "/") !=0)
+    && strcmp(name, "/") !=0 && name[last-1] != ':')
     {
     memcpy(buffer, name, last);
     buffer[last] = 0;

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

Summary of changes:
 Source/CMakeVersion.cmake    |    2 +-
 Source/kwsys/SystemTools.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake