[Cmake-commits] CMake branch, master, updated. v3.2.0-383-gfa4617b

[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  fa4617b7ea00474053b3d0278f316db226322626 (commit)
       via  024e25e485f8d1dbca40521fbc0bcd61e383f413 (commit)
       via  3ef776fc38fecff332e568f307dcf4e6f82fbe14 (commit)
      from  a5505c4c53672a55f5e9e577ffb0ac3bd78c7847 (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=fa4617b7ea00474053b3d0278f316db226322626
commit fa4617b7ea00474053b3d0278f316db226322626
Merge: a5505c4 024e25e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 10 09:12:24 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 10 09:12:24 2015 -0400

    Merge topic 'configure_file-NEWLINE_STYLE-no-warn'
    
    024e25e4 Tests: Add more signature tests to RunCMake.configure_file test
    3ef776fc configure_file: Do not warn about newline style arguments


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

Summary of changes:
 Source/cmConfigureFileCommand.cxx                  |    7 +++++
 Tests/CMakeTests/CMakeLists.txt                    |    1 -
 Tests/CMakeTests/ConfigureFile-DirOutput.cmake     |    5 ----
 Tests/CMakeTests/ConfigureFile-Relative.cmake      |    4 ---
 Tests/CMakeTests/ConfigureFileTest.cmake.in        |   28 --------------------
 .../BadArg-result.txt}                             |    0
 Tests/RunCMake/configure_file/BadArg-stderr.txt    |    4 +++
 .../configure_file/BadArg.cmake}                   |    0
 .../DirInput-result.txt}                           |    0
 Tests/RunCMake/configure_file/DirInput-stderr.txt  |    8 ++++++
 .../configure_file/DirInput.cmake}                 |    0
 Tests/RunCMake/configure_file/DirOutput-stderr.txt |    1 +
 Tests/RunCMake/configure_file/DirOutput.cmake      |    4 +++
 Tests/RunCMake/configure_file/DirOutput.txt        |    1 +
 .../NewLineStyle-COPYONLY-result.txt}              |    0
 .../NewLineStyle-COPYONLY-stderr.txt               |    4 +++
 .../configure_file/NewLineStyle-COPYONLY.cmake}    |    2 +-
 .../NewLineStyle-NoArg-result.txt}                 |    0
 .../configure_file/NewLineStyle-NoArg-stderr.txt   |    5 ++++
 .../configure_file/NewLineStyle-NoArg.cmake}       |    2 +-
 .../configure_file/NewLineStyle-ValidArg.cmake}    |    2 +-
 .../NewLineStyle-WrongArg-result.txt}              |    0
 .../NewLineStyle-WrongArg-stderr.txt               |    5 ++++
 .../configure_file/NewLineStyle-WrongArg.cmake}    |    2 +-
 Tests/RunCMake/configure_file/Relative-In.txt      |    1 +
 Tests/RunCMake/configure_file/Relative-stderr.txt  |    1 +
 Tests/RunCMake/configure_file/Relative.cmake       |    3 +++
 Tests/RunCMake/configure_file/RunCMakeTest.cmake   |    8 ++++++
 28 files changed, 56 insertions(+), 42 deletions(-)
 delete mode 100644 Tests/CMakeTests/ConfigureFile-DirOutput.cmake
 delete mode 100644 Tests/CMakeTests/ConfigureFile-Relative.cmake
 delete mode 100644 Tests/CMakeTests/ConfigureFileTest.cmake.in
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/BadArg-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/BadArg-stderr.txt
 rename Tests/{CMakeTests/ConfigureFile-BadArg.cmake => RunCMake/configure_file/BadArg.cmake} (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/DirInput-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/DirInput-stderr.txt
 rename Tests/{CMakeTests/ConfigureFile-DirInput.cmake => RunCMake/configure_file/DirInput.cmake} (100%)
 create mode 100644 Tests/RunCMake/configure_file/DirOutput-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/DirOutput.cmake
 create mode 100644 Tests/RunCMake/configure_file/DirOutput.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/NewLineStyle-COPYONLY-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/NewLineStyle-COPYONLY-stderr.txt
 rename Tests/{CMakeTests/ConfigureFile-NewLineStyle-COPYONLY.cmake => RunCMake/configure_file/NewLineStyle-COPYONLY.cmake} (58%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/NewLineStyle-NoArg-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/NewLineStyle-NoArg-stderr.txt
 rename Tests/{CMakeTests/ConfigureFile-NewLineStyle-NoArg.cmake => RunCMake/configure_file/NewLineStyle-NoArg.cmake} (55%)
 rename Tests/{CMakeTests/ConfigureFile-NewLineStyle-ValidArg.cmake => RunCMake/configure_file/NewLineStyle-ValidArg.cmake} (85%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/NewLineStyle-WrongArg-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/NewLineStyle-WrongArg-stderr.txt
 rename Tests/{CMakeTests/ConfigureFile-NewLineStyle-WrongArg.cmake => RunCMake/configure_file/NewLineStyle-WrongArg.cmake} (56%)
 create mode 100644 Tests/RunCMake/configure_file/Relative-In.txt
 create mode 100644 Tests/RunCMake/configure_file/Relative-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/Relative.cmake


hooks/post-receive
-- 
CMake