[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5772-g764d987

[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  764d987919e8cd4feaca0d8a9fa6532c67845354 (commit)
       via  abd2b3608960d781b30415e4b1c0ea8ad51ca9e7 (commit)
      from  6379f397c119480712c55787afbc2ea67d6028f2 (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=764d987919e8cd4feaca0d8a9fa6532c67845354
commit 764d987919e8cd4feaca0d8a9fa6532c67845354
Merge: 6379f39 abd2b36
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 25 13:15:13 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 13:15:13 2013 -0500

    Merge topic 'watcom-no-prompt' into next
    
    abd2b36 Watcom: Suppress WMake interactive prompt on error


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=abd2b3608960d781b30415e4b1c0ea8ad51ca9e7
commit abd2b3608960d781b30415e4b1c0ea8ad51ca9e7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 25 12:59:19 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 25 13:14:38 2013 -0500

    Watcom: Suppress WMake interactive prompt on error
    
    Add the "-e" option to build.make invocations of wmake as part of
    the silencing flags.  From "wmake /?":
    
     -e erase files after error (no prompt)
    
    This prevents test timeouts on error.

diff --git a/Source/cmGlobalWatcomWMakeGenerator.cxx b/Source/cmGlobalWatcomWMakeGenerator.cxx
index 6ae8775..98ce685 100644
--- a/Source/cmGlobalWatcomWMakeGenerator.cxx
+++ b/Source/cmGlobalWatcomWMakeGenerator.cxx
@@ -47,7 +47,7 @@ cmLocalGenerator *cmGlobalWatcomWMakeGenerator::CreateLocalGenerator()
   lg->SetDefineWindowsNULL(true);
   lg->SetWindowsShell(true);
   lg->SetWatcomWMake(true);
-  lg->SetMakeSilentFlag("-s -h");
+  lg->SetMakeSilentFlag("-s -h -e");
   lg->SetGlobalGenerator(this);
   lg->SetIgnoreLibPrefix(true);
   lg->SetPassMakeflags(false);

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

Summary of changes:
 Source/cmGlobalWatcomWMakeGenerator.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake