[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-479-g8ec6b90

[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  8ec6b905a24f367e12486e39ef47ef5d2a3ba495 (commit)
       via  502430e39cb6c3c860baf90cd9a0c400503e16af (commit)
       via  da4cddd787500b9da71e7c7877de9a17c6a7d1fc (commit)
      from  52a9b25dc586855b12f9b800c5ec92b25a60b45c (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=8ec6b905a24f367e12486e39ef47ef5d2a3ba495
commit 8ec6b905a24f367e12486e39ef47ef5d2a3ba495
Merge: 52a9b25 502430e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 16 08:49:37 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 16 08:49:37 2015 -0400

    Merge topic 'update-kwsys' into next
    
    502430e3 Merge branch 'upstream-kwsys' into update-kwsys
    da4cddd7 KWSys 2015-06-15 (d217407c)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=502430e39cb6c3c860baf90cd9a0c400503e16af
commit 502430e39cb6c3c860baf90cd9a0c400503e16af
Merge: 84672a8 da4cddd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 16 08:49:12 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 16 08:49:12 2015 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da4cddd787500b9da71e7c7877de9a17c6a7d1fc
commit da4cddd787500b9da71e7c7877de9a17c6a7d1fc
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Mon Jun 15 09:50:46 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 16 08:48:52 2015 -0400

    KWSys 2015-06-15 (d217407c)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ d217407c | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 8533a79b..d217407c
    Brad King (1):
          d217407c SystemTools: Fix preprocessor check WIN32 => _WIN32

diff --git a/SystemTools.cxx b/SystemTools.cxx
index c834e34..fed1c9c 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -4408,7 +4408,7 @@ bool SystemTools::FileIsFullPath(const char* in_name, size_t len)
 
 bool SystemTools::GetShortPath(const kwsys_stl::string& path, kwsys_stl::string& shortPath)
 {
-#if defined(WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
   const int size = int(path.size()) +1; // size of return
   char *tempPath = new char[size];  // create a buffer
   DWORD ret;

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

Summary of changes:
 Source/kwsys/SystemTools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake