[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2764-gc3ebed0

[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  c3ebed08e45ea4f8ea9c755740050a83f5764361 (commit)
       via  063617cd18fc162fb82fe451c77bf76fbdd85476 (commit)
       via  045fc841173b97d8754d0dfd75322bd4919c19e6 (commit)
      from  9dc0fe3b145404a2b4bebb9cbf4d181d6c4cc48d (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=c3ebed08e45ea4f8ea9c755740050a83f5764361
commit c3ebed08e45ea4f8ea9c755740050a83f5764361
Merge: 9dc0fe3 063617c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 26 09:59:52 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 26 09:59:52 2013 -0400

    Merge topic 'update-kwsys' into next
    
    063617c Merge branch 'upstream-kwsys' into update-kwsys
    045fc84 KWSys 2013-06-24 (3d1d4e7c)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=063617cd18fc162fb82fe451c77bf76fbdd85476
commit 063617cd18fc162fb82fe451c77bf76fbdd85476
Merge: bef7c02 045fc84
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 26 09:52:46 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 26 09:52:46 2013 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=045fc841173b97d8754d0dfd75322bd4919c19e6
commit 045fc841173b97d8754d0dfd75322bd4919c19e6
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Mon Jun 24 11:19:43 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 26 09:52:42 2013 -0400

    KWSys 2013-06-24 (3d1d4e7c)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 3d1d4e7c | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' d79a792e..3d1d4e7c
    Cory Quammen (1):
          3d1d4e7c SystemTools: MakeDirectory() reports failure if path is file
    
    Change-Id: I080ed62630304c63c65efaf4be08198a6411ae48

diff --git a/SystemTools.cxx b/SystemTools.cxx
index 7891708..4d5af5e 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -605,7 +605,7 @@ bool SystemTools::MakeDirectory(const char* path)
     }
   if(SystemTools::FileExists(path))
     {
-    return true;
+    return SystemTools::FileIsDirectory(path);
     }
   kwsys_stl::string dir = path;
   if(dir.size() == 0)

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

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


hooks/post-receive
-- 
CMake