[Cmake-commits] CMake branch, next, updated. v3.1.1-2303-g7bd3663

[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  7bd36637c767f0a8e4dd159d36037b7058ae7b81 (commit)
       via  391748d57e090c53f6c55ea265e038fde1bca032 (commit)
       via  0b9aad7568bc5f1cf56e01fe2b3dc57f5dff5133 (commit)
       via  97502ba77b6d589e2ff48a22b703f6908d5b5fdc (commit)
      from  3a70f6e34c49ceab09e36bfd5bb623bbc312707b (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=7bd36637c767f0a8e4dd159d36037b7058ae7b81
commit 7bd36637c767f0a8e4dd159d36037b7058ae7b81
Merge: 3a70f6e 391748d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 24 07:39:39 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 24 07:39:39 2015 -0500

    Merge topic 'update-kwsys' into next
    
    391748d5 Merge branch 'upstream-kwsys' into update-kwsys
    0b9aad75 KWSys 2015-01-23 (d4e7f08e)
    97502ba7 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=391748d57e090c53f6c55ea265e038fde1bca032
commit 391748d57e090c53f6c55ea265e038fde1bca032
Merge: 97502ba 0b9aad7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 24 07:38:51 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Jan 24 07:38:51 2015 -0500

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b9aad7568bc5f1cf56e01fe2b3dc57f5dff5133
commit 0b9aad7568bc5f1cf56e01fe2b3dc57f5dff5133
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Fri Jan 23 13:14:29 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Jan 24 07:38:43 2015 -0500

    KWSys 2015-01-23 (d4e7f08e)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ d4e7f08e | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' b33e7b96..d4e7f08e
    Brad King (1):
          d4e7f08e Directory: Check opendir return value before using it
    
    Change-Id: I3485ec9c7ad3b7f25df610d4d1898c5150a995f0

diff --git a/Directory.cxx b/Directory.cxx
index 04b2866..58cea63 100644
--- a/Directory.cxx
+++ b/Directory.cxx
@@ -244,6 +244,11 @@ unsigned long Directory::GetNumberOfFilesInDirectory(const kwsys_stl::string& na
 {
   DIR* dir = opendir(name.c_str());
 
+  if (!dir)
+    {
+    return 0;
+    }
+
   unsigned long count = 0;
   for (kwsys_dirent* d = readdir(dir); d; d = readdir(dir) )
     {

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

Summary of changes:
 Source/CMakeVersion.cmake  |    2 +-
 Source/kwsys/Directory.cxx |    5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake