[Cmake-commits] CMake branch, next, updated. v3.0.0-rc5-3200-gd908f48

[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  d908f48b87ea3e28a74e4476eeb4a8e45930c0dd (commit)
       via  2a47416fe115052b3dbc7983e91a484d5d31aac7 (commit)
       via  dbea0ba57ccd9107ff76782584ed285c883fb7e6 (commit)
       via  d5f8abc286ab69a0e136e51fec3d02acb7604abd (commit)
       via  e536c14b7b277ab1a4a8bea848ba42ec27d89ce6 (commit)
       via  d5b51d3204b6b95f2d8c11398fd5805647f9a71b (commit)
      from  49bbad965e7f547586449b813a90152155652385 (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=d908f48b87ea3e28a74e4476eeb4a8e45930c0dd
commit d908f48b87ea3e28a74e4476eeb4a8e45930c0dd
Merge: 49bbad9 2a47416
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 19 09:38:40 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 19 09:38:40 2014 -0400

    Merge topic 'update-kwsys' into next
    
    2a47416f Merge branch 'upstream-kwsys' into update-kwsys
    dbea0ba5 KWSys 2014-05-16 (2e00d252)
    d5f8abc2 CMake Nightly Date Stamp
    e536c14b CMake Nightly Date Stamp
    d5b51d32 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a47416fe115052b3dbc7983e91a484d5d31aac7
commit 2a47416fe115052b3dbc7983e91a484d5d31aac7
Merge: d5f8abc dbea0ba
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 19 09:37:46 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 19 09:37:46 2014 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbea0ba57ccd9107ff76782584ed285c883fb7e6
commit dbea0ba57ccd9107ff76782584ed285c883fb7e6
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Fri May 16 12:40:23 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 19 09:37:40 2014 -0400

    KWSys 2014-05-16 (2e00d252)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 2e00d252 | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 6074f33f..2e00d252
    Brad King (1):
          2e00d252 SystemTools: Port cygwin path conversion to modern API
    
    Change-Id: Ie7e23b9e66911db3443b5ca678b1f753a031f9f2

diff --git a/SystemTools.cxx b/SystemTools.cxx
index a2681c1..704cbbc 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -92,7 +92,7 @@ extern char **environ;
 #endif
 
 #ifdef __CYGWIN__
-extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path);
+# include <sys/cygwin.h>
 #endif
 
 // getpwnam doesn't exist on Windows and Cray Xt3/Catamount
@@ -1113,7 +1113,10 @@ bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
     }
   else
     {
-    cygwin_conv_to_win32_path(path, win32_path);
+    if(cygwin_conv_path(CCP_POSIX_TO_WIN_A, path, win32_path, MAX_PATH) != 0)
+      {
+      win32_path[0] = 0;
+      }
     SystemToolsTranslationMap::value_type entry(path, win32_path);
     SystemTools::Cyg2Win32Map->insert(entry);
     }

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

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


hooks/post-receive
-- 
CMake