[Cmake-commits] CMake branch, master, updated. v2.8.6-299-g97142c7

[David Cole]

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  97142c76038606a1111918c1b5585d8e9caf1336 (commit)
       via  ac2e45d0893dd283c04c600e626bf80ea57d4a71 (commit)
       via  28c46ca6cd6ffd344e83c79108bc5b54eb7d7428 (commit)
       via  75e83e98fa3faff93f3562e38fa851b6dd5b5a95 (commit)
       via  be6502c5027935cba246e654e5d3006f8da216f4 (commit)
       via  a087490697c416d429d30fdf389cca2f13d9d14e (commit)
      from  333fd1131c539e60a8da6ad1e8516009eabf11c2 (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=97142c76038606a1111918c1b5585d8e9caf1336
commit 97142c76038606a1111918c1b5585d8e9caf1336
Merge: 333fd11 ac2e45d
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Thu Dec 1 14:03:24 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 1 14:03:24 2011 -0500

    Merge topic 'newline-style'
    
    ac2e45d Provide std::ios_base typedef on GCC < 3
    28c46ca cmNewLineStyle: Use cmStandardIncludes.h
    75e83e9 cmNewLineStyle: Remove trailing comma in enum
    be6502c bootstrap: Include cmNewLineStyle in build
    a087490 Add NEWLINE_STYLE option to configure_file (#3957)


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

Summary of changes:
 Source/CMakeLists.txt                              |    2 +
 Source/cmConfigureFileCommand.cxx                  |   15 +++-
 Source/cmConfigureFileCommand.h                    |   11 ++-
 Source/cmMakefile.cxx                              |   18 +++-
 Source/cmMakefile.h                                |    5 +-
 Source/cmNewLineStyle.cxx                          |   95 ++++++++++++++++++++
 Source/cmNewLineStyle.h                            |   46 ++++++++++
 Source/cmStandardIncludes.h                        |    5 +
 .../ConfigureFile-NewLineStyle-COPYONLY.cmake      |    3 +
 .../ConfigureFile-NewLineStyle-NoArg.cmake         |    3 +
 .../ConfigureFile-NewLineStyle-ValidArg.cmake      |   17 ++++
 .../ConfigureFile-NewLineStyle-WrongArg.cmake      |    3 +
 Tests/CMakeTests/ConfigureFileTest.cmake.in        |   12 +++
 bootstrap                                          |    1 +
 14 files changed, 229 insertions(+), 7 deletions(-)
 create mode 100644 Source/cmNewLineStyle.cxx
 create mode 100644 Source/cmNewLineStyle.h
 create mode 100644 Tests/CMakeTests/ConfigureFile-NewLineStyle-COPYONLY.cmake
 create mode 100644 Tests/CMakeTests/ConfigureFile-NewLineStyle-NoArg.cmake
 create mode 100644 Tests/CMakeTests/ConfigureFile-NewLineStyle-ValidArg.cmake
 create mode 100644 Tests/CMakeTests/ConfigureFile-NewLineStyle-WrongArg.cmake


hooks/post-receive
-- 
CMake