[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1156-g537342a

[Clinton Stimpson]

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  537342a61372b0afe69d3049d5574e623f69b5b9 (commit)
       via  23bed24bef6dab1b00a2349616a604eed784e197 (commit)
      from  42d3675470a486c8baca906af8a13d1b8d3c829f (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=537342a61372b0afe69d3049d5574e623f69b5b9
commit 537342a61372b0afe69d3049d5574e623f69b5b9
Merge: 42d3675 23bed24
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Mar 17 16:01:17 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 17 16:01:17 2014 -0400

    Merge topic 'configure_file-unicode' into next
    
    23bed24b Unicode:  slight clarification on error message.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=23bed24bef6dab1b00a2349616a604eed784e197
commit 23bed24bef6dab1b00a2349616a604eed784e197
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Mar 17 14:00:48 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Mar 17 14:00:48 2014 -0600

    Unicode:  slight clarification on error message.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0e43d6e..d0e6c30 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3523,7 +3523,7 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
        bom != cmsys::FStream::BOM_UTF8)
       {
       cmOStringStream e;
-      e << "File starts with a Byte-Order-Mark that is not UTF-8\n  "
+      e << "File starts with a Byte-Order-Mark that is not UTF-8:\n  "
         << sinfile;
       this->IssueMessage(cmake::FATAL_ERROR, e.str());
       return 0;
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
index ee4bb90..5132c4d 100644
--- a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error at UTF16BE-BOM.cmake:2 \(configure_file\):
-  File starts with a Byte-Order-Mark that is not UTF-8
+  File starts with a Byte-Order-Mark that is not UTF-8:
 
     .*/Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
index bf254c4..8f997bc 100644
--- a/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error at UTF16LE-BOM.cmake:2 \(configure_file\):
-  File starts with a Byte-Order-Mark that is not UTF-8
+  File starts with a Byte-Order-Mark that is not UTF-8:
 
     .*/Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
index c85aa0c..12811aa 100644
--- a/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error at UTF32BE-BOM.cmake:2 \(configure_file\):
-  File starts with a Byte-Order-Mark that is not UTF-8
+  File starts with a Byte-Order-Mark that is not UTF-8:
 
     .*/Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in
 Call Stack \(most recent call first\):
diff --git a/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
index 67b9bc1..fa9e01a 100644
--- a/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
@@ -1,5 +1,5 @@
 CMake Error at UTF32LE-BOM.cmake:2 \(configure_file\):
-  File starts with a Byte-Order-Mark that is not UTF-8
+  File starts with a Byte-Order-Mark that is not UTF-8:
 
     .*/Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in
 Call Stack \(most recent call first\):

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

Summary of changes:
 Source/cmMakefile.cxx                                |    2 +-
 Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt |    2 +-
 Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt |    2 +-
 Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt |    2 +-
 Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake