[Cmake-commits] CMake branch, next, updated. v3.0.0-4372-ga757dc1

[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  a757dc10e16b8f6e7840c9e59fe653d9b47eec2b (commit)
       via  6f3e094e9f0017b63e138e001c86e467c8f9b7c9 (commit)
       via  d4d1b7f7d1d6592f12a6692dfb8068aa495bd454 (commit)
       via  bbd930ea3c7fbc376d2f112ae7cd373a27cdf5bc (commit)
      from  b87f9e1486bbda614e7a7037b46b0ea08cde6392 (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=a757dc10e16b8f6e7840c9e59fe653d9b47eec2b
commit a757dc10e16b8f6e7840c9e59fe653d9b47eec2b
Merge: b87f9e1 6f3e094
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 18 10:20:30 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 18 10:20:30 2014 -0400

    Merge topic 'update-kwsys' into next
    
    6f3e094e Merge branch 'upstream-kwsys' into update-kwsys
    d4d1b7f7 KWSys 2014-07-18 (65b36ede)
    bbd930ea CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6f3e094e9f0017b63e138e001c86e467c8f9b7c9
commit 6f3e094e9f0017b63e138e001c86e467c8f9b7c9
Merge: bbd930e d4d1b7f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 18 10:15:23 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 18 10:15:23 2014 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4d1b7f7d1d6592f12a6692dfb8068aa495bd454
commit d4d1b7f7d1d6592f12a6692dfb8068aa495bd454
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Fri Jul 18 08:32:24 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jul 18 10:15:20 2014 -0400

    KWSys 2014-07-18 (65b36ede)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 65b36ede | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' c2a329ce..65b36ede
    Bob E (1):
          697b1401 SystemInformation: No SA_RESTART on QNX
    
    Clinton Stimpson (1):
          65b36ede Encoding: Fix testProcess to work with unicode paths.
    
    Steve Dougherty (1):
          5f28a52b Terminal: Fix spelling of 'definitely' in comments
    
    Change-Id: I224745dc0ca9603ff915b727e798ef293c462d8f

diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 6544098..2521aac 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -3696,7 +3696,10 @@ void SystemInformationImplementation::SetStackTraceOnError(int enable)
     // install ours
     struct sigaction sa;
     sa.sa_sigaction=(SigAction)StacktraceSignalHandler;
-    sa.sa_flags=SA_SIGINFO|SA_RESTART|SA_RESETHAND;
+    sa.sa_flags=SA_SIGINFO|SA_RESETHAND;
+# ifdef SA_RESTART
+    sa.sa_flags|=SA_RESTART;
+# endif
     sigemptyset(&sa.sa_mask);
 
     sigaction(SIGABRT,&sa,0);
diff --git a/Terminal.c b/Terminal.c
index 6d7ec41..e13003f 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -104,11 +104,11 @@ void kwsysTerminal_cfprintf(int color, FILE* stream, const char* format, ...)
 }
 
 /*--------------------------------------------------------------------------*/
-/* Detect cases when a stream is definately not interactive.  */
+/* Detect cases when a stream is definitely not interactive.  */
 #if !defined(KWSYS_TERMINAL_ISATTY_WORKS)
 static int kwsysTerminalStreamIsNotInteractive(FILE* stream)
 {
-  /* The given stream is definately not interactive if it is a regular
+  /* The given stream is definitely not interactive if it is a regular
      file.  */
   struct stat stream_stat;
   if(fstat(fileno(stream), &stream_stat) == 0)
@@ -212,7 +212,7 @@ static int kwsysTerminalStreamIsVT100(FILE* stream, int default_vt100,
   (void)default_tty;
   return isatty(fileno(stream))? 1:0;
 #else
-  /* Check for cases in which the stream is definately not a tty.  */
+  /* Check for cases in which the stream is definitely not a tty.  */
   if(kwsysTerminalStreamIsNotInteractive(stream))
     {
     return 0;
diff --git a/testProcess.c b/testProcess.c
index 6d5eb71..3d62822 100644
--- a/testProcess.c
+++ b/testProcess.c
@@ -11,11 +11,13 @@
 ============================================================================*/
 #include "kwsysPrivate.h"
 #include KWSYS_HEADER(Process.h)
+#include KWSYS_HEADER(Encoding.h)
 
 /* Work-around CMake dependency scanning limitation.  This must
    duplicate the above list of headers.  */
 #if 0
 # include "Process.h.in"
+# include "Encoding.h.in"
 #endif
 
 #include <stdio.h>
@@ -393,6 +395,19 @@ int runChild(const char* cmd[], int state, int exception, int value,
 int main(int argc, const char* argv[])
 {
   int n = 0;
+
+#ifdef _WIN32
+  int i;
+  char new_args[10][_MAX_PATH];
+  LPWSTR* w_av = CommandLineToArgvW(GetCommandLineW(), &argc);
+  for(i=0; i<argc; i++)
+  {
+    kwsysEncoding_wcstombs(new_args[i], w_av[i], _MAX_PATH);
+    argv[i] = new_args[i];
+  }
+  LocalFree(w_av);
+#endif
+
 #if 0
     {
     HANDLE out = GetStdHandle(STD_OUTPUT_HANDLE);

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

Summary of changes:
 Source/CMakeVersion.cmake          |    2 +-
 Source/kwsys/SystemInformation.cxx |    5 ++++-
 Source/kwsys/Terminal.c            |    6 +++---
 Source/kwsys/testProcess.c         |   15 +++++++++++++++
 4 files changed, 23 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake