[Cmake-commits] CMake branch, next, updated. v3.2.1-1776-g0e339f2

[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  0e339f22ca26e53a6c7f6b9bbe270eba498a8b0e (commit)
       via  e538858349527efc1cf3ebcfb824b114964262df (commit)
       via  d34d5a370ec656aab6f980218d74002789fedfff (commit)
      from  d6395c5a8902923cbb7cb63f6101141822d119cf (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=0e339f22ca26e53a6c7f6b9bbe270eba498a8b0e
commit 0e339f22ca26e53a6c7f6b9bbe270eba498a8b0e
Merge: d6395c5 e538858
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 13 09:02:38 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 13 09:02:38 2015 -0400

    Merge topic 'update-kwsys' into next
    
    e5388583 Merge branch 'upstream-kwsys' into update-kwsys
    d34d5a37 KWSys 2015-04-10 (69bccf2e)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e538858349527efc1cf3ebcfb824b114964262df
commit e538858349527efc1cf3ebcfb824b114964262df
Merge: 10859b9 d34d5a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 13 09:01:59 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 13 09:01:59 2015 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d34d5a370ec656aab6f980218d74002789fedfff
commit d34d5a370ec656aab6f980218d74002789fedfff
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Fri Apr 10 08:55:18 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Apr 13 09:01:55 2015 -0400

    KWSys 2015-04-10 (69bccf2e)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 69bccf2e | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 9367a33b..69bccf2e
    Brad King (1):
          69bccf2e SystemTools: Teach Touch with !create to succeed on missing file
    
    Change-Id: I4af502542578b6a16ca4ddffb03553a046378e56

diff --git a/SystemTools.cxx b/SystemTools.cxx
index 8a481d6..6c4a7a6 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -1260,15 +1260,22 @@ bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
 
 bool SystemTools::Touch(const kwsys_stl::string& filename, bool create)
 {
-  if(create && !SystemTools::FileExists(filename))
+  if (!SystemTools::FileExists(filename))
     {
-    FILE* file = Fopen(filename, "a+b");
-    if(file)
+    if(create)
+      {
+      FILE* file = Fopen(filename, "a+b");
+      if(file)
+        {
+        fclose(file);
+        return true;
+        }
+      return false;
+      }
+    else
       {
-      fclose(file);
       return true;
       }
-    return false;
     }
 #if defined(_WIN32) && !defined(__CYGWIN__)
   HANDLE h = CreateFileW(

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

Summary of changes:


hooks/post-receive
-- 
CMake