[Cmake-commits] CMake branch, master, updated. v3.0.0-rc2-344-g565213c

Brad King brad.king at kitware.com
Thu Mar 20 09:22:29 EDT 2014


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  565213c1fd2d439ebb404cf26f9b1a5c9e9a60e1 (commit)
       via  98383f802aadcd2d469c4d7543e0a2abe8c3cdb9 (commit)
      from  df136e6c27d7430662eb11f5acd386927ad5e993 (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=565213c1fd2d439ebb404cf26f9b1a5c9e9a60e1
commit 565213c1fd2d439ebb404cf26f9b1a5c9e9a60e1
Merge: df136e6 98383f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 20 09:22:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 20 09:22:28 2014 -0400

    Merge topic 'configure_file-unicode'
    
    98383f80 Unicode: check encoding of files given to configure_file.


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

Summary of changes:
 Source/cmMakefile.cxx                                    |   14 ++++++++++++++
 Tests/RunCMake/CMakeLists.txt                            |    1 +
 .../CMakeLists.txt                                       |    2 +-
 Tests/RunCMake/configure_file/NO-BOM.cmake               |    2 ++
 Tests/RunCMake/configure_file/NO-BOM.txt.in              |    1 +
 Tests/RunCMake/configure_file/RunCMakeTest.cmake         |    8 ++++++++
 .../UTF16BE-BOM-result.txt}                              |    0
 Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt     |    6 ++++++
 Tests/RunCMake/configure_file/UTF16BE-BOM.cmake          |    2 ++
 Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in         |  Bin 0 -> 26 bytes
 .../UTF16LE-BOM-result.txt}                              |    0
 Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt     |    6 ++++++
 Tests/RunCMake/configure_file/UTF16LE-BOM.cmake          |    2 ++
 Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in         |  Bin 0 -> 26 bytes
 .../UTF32BE-BOM-result.txt}                              |    0
 Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt     |    6 ++++++
 Tests/RunCMake/configure_file/UTF32BE-BOM.cmake          |    2 ++
 Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in         |  Bin 0 -> 52 bytes
 .../UTF32LE-BOM-result.txt}                              |    0
 Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt     |    6 ++++++
 Tests/RunCMake/configure_file/UTF32LE-BOM.cmake          |    2 ++
 Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in         |  Bin 0 -> 52 bytes
 Tests/RunCMake/configure_file/UTF8-BOM.cmake             |    2 ++
 Tests/RunCMake/configure_file/UTF8-BOM.txt.in            |    1 +
 bootstrap                                                |    1 +
 25 files changed, 63 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{cmake_minimum_required => configure_file}/CMakeLists.txt (63%)
 create mode 100644 Tests/RunCMake/configure_file/NO-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/NO-BOM.txt.in
 create mode 100644 Tests/RunCMake/configure_file/RunCMakeTest.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/UTF16BE-BOM-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/UTF16BE-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/UTF16LE-BOM-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/UTF16LE-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/UTF32BE-BOM-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/UTF32BE-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => configure_file/UTF32LE-BOM-result.txt} (100%)
 create mode 100644 Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
 create mode 100644 Tests/RunCMake/configure_file/UTF32LE-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in
 create mode 100644 Tests/RunCMake/configure_file/UTF8-BOM.cmake
 create mode 100644 Tests/RunCMake/configure_file/UTF8-BOM.txt.in


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list