[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1140-g71133a8

[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  71133a88a9a5373a13c5b2bb3898c3757606bb70 (commit)
       via  1ce2d3de7fa9bb02d63c14d1e8a8085939df8f9e (commit)
      from  85ea1c7df41f35687dedce3a0e34513e190c28da (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=71133a88a9a5373a13c5b2bb3898c3757606bb70
commit 71133a88a9a5373a13c5b2bb3898c3757606bb70
Merge: 85ea1c7 1ce2d3d
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Mar 17 12:32:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 17 12:32:46 2014 -0400

    Merge topic 'configure_file-unicode' into next
    
    1ce2d3de Unicode: Fix formatting error.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1ce2d3de7fa9bb02d63c14d1e8a8085939df8f9e
commit 1ce2d3de7fa9bb02d63c14d1e8a8085939df8f9e
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Mar 17 10:32:24 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Mar 17 10:32:24 2014 -0600

    Unicode: Fix formatting error.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40c34e2..0e43d6e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3523,7 +3523,8 @@ 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 " << sinfile;
+      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 eb6e08f..ee4bb90 100644
--- a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
@@ -1,5 +1,6 @@
 CMake Error at UTF16BE-BOM.cmake:2 \(configure_file\):
   File starts with a Byte-Order-Mark that is not UTF-8
-  .*/Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in
+
+    .*/Tests/RunCMake/configure_file/UTF16BE-BOM.txt.in
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
index d2c2429..bf254c4 100644
--- a/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF16LE-BOM-stderr.txt
@@ -1,5 +1,6 @@
 CMake Error at UTF16LE-BOM.cmake:2 \(configure_file\):
   File starts with a Byte-Order-Mark that is not UTF-8
-  .*/Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in
+
+    .*/Tests/RunCMake/configure_file/UTF16LE-BOM.txt.in
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
index 95ff428..c85aa0c 100644
--- a/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF32BE-BOM-stderr.txt
@@ -1,5 +1,6 @@
 CMake Error at UTF32BE-BOM.cmake:2 \(configure_file\):
   File starts with a Byte-Order-Mark that is not UTF-8
-  .*/Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in
+
+    .*/Tests/RunCMake/configure_file/UTF32BE-BOM.txt.in
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
index b1d4d4a..67b9bc1 100644
--- a/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
+++ b/Tests/RunCMake/configure_file/UTF32LE-BOM-stderr.txt
@@ -1,5 +1,6 @@
 CMake Error at UTF32LE-BOM.cmake:2 \(configure_file\):
   File starts with a Byte-Order-Mark that is not UTF-8
-  .*/Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in
+
+    .*/Tests/RunCMake/configure_file/UTF32LE-BOM.txt.in
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)

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

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


hooks/post-receive
-- 
CMake