[Cmake-commits] CMake branch, master, updated. v3.1.2-1047-gc548ddc

[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, master has been updated
       via  c548ddc1724c9c96bab04d2f51d1740360bcb737 (commit)
       via  63668954e002aa41ff0287aae22caeeacdc0c356 (commit)
       via  ae775fe8041183030c69db1714c898b6e74f1284 (commit)
       via  7bb50e4a31ad5a8a58fe60885014d431a887b27f (commit)
       via  c6ada8275b680e02f50a7aee1c02b0b184cadf83 (commit)
       via  8521fdf56e4908676c28c6bbdda3f1fb2284d3d7 (commit)
       via  69ac6d27555cd4819d0c7f40e4471c6f885e23ab (commit)
      from  1d6f4b6fcc04620fd5f8e090381e8330dc2a4b23 (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=c548ddc1724c9c96bab04d2f51d1740360bcb737
commit c548ddc1724c9c96bab04d2f51d1740360bcb737
Merge: 1d6f4b6 6366895
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 10 09:37:55 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 10 09:37:55 2015 -0500

    Merge topic 'makefile-progress-improvements'
    
    63668954 Help: Add notes for topic 'makefile-progress-improvements'
    ae775fe8 Makefile: Change link step message color to bold green
    7bb50e4a Makefile: Add progress to link step messages
    c6ada827 Makefile: Print all color escape sequences before newline
    8521fdf5 Makefile: Fix output during parallel builds (#12991)
    69ac6d27 bootstrap: Enable color Makefile output

diff --cc Source/cmSystemTools.cxx
index 6a7467f,f50d16c..d6f8d6b
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@@ -26,9 -26,7 +26,8 @@@
  #include <cmsys/Encoding.hxx>
  #if defined(CMAKE_BUILD_WITH_CMAKE)
  # include "cmArchiveWrite.h"
 +# include "cmLocale.h"
  # include <cm_libarchive.h>
- # include <cmsys/Terminal.h>
  #endif
  #include <cmsys/stl/algorithm>
  #include <cmsys/FStream.hxx>

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

Summary of changes:
 .../release/dev/makefile-progress-improvements.rst |    7 ++
 Source/cmGlobalUnixMakefileGenerator3.cxx          |   43 +++----
 Source/cmLocalUnixMakefileGenerator3.cxx           |   35 +++---
 Source/cmLocalUnixMakefileGenerator3.h             |    5 +-
 Source/cmMakefileExecutableTargetGenerator.cxx     |    6 +-
 Source/cmMakefileLibraryTargetGenerator.cxx        |    6 +-
 Source/cmMakefileTargetGenerator.cxx               |   36 +++---
 Source/cmMakefileTargetGenerator.h                 |    2 +-
 Source/cmSystemTools.cxx                           |   16 ++-
 Source/cmSystemTools.h                             |    2 -
 Source/cmcmd.cxx                                   |  128 ++++++++++++--------
 bootstrap                                          |    9 +-
 12 files changed, 170 insertions(+), 125 deletions(-)
 create mode 100644 Help/release/dev/makefile-progress-improvements.rst


hooks/post-receive
-- 
CMake