[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1124-g96e1c8f

[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  96e1c8fab1597b7c2f277b4bd79713f8d52738f3 (commit)
       via  2a7dc5302d2ccf027443842c79f0ec1aee390362 (commit)
      from  07b8a5bb72a92d233edc51e4ddbd5790cf53b163 (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=96e1c8fab1597b7c2f277b4bd79713f8d52738f3
commit 96e1c8fab1597b7c2f277b4bd79713f8d52738f3
Merge: 07b8a5b 2a7dc53
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Mar 17 10:19:13 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 17 10:19:13 2014 -0400

    Merge topic 'configure_file-unicode' into next
    
    2a7dc530 Unicode: better error message for configure_file.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2a7dc5302d2ccf027443842c79f0ec1aee390362
commit 2a7dc5302d2ccf027443842c79f0ec1aee390362
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Mar 17 08:18:42 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Mar 17 08:18:42 2014 -0600

    Unicode: better error message for configure_file.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ebf83bd..40c34e2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3522,9 +3522,9 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
     if(bom != cmsys::FStream::BOM_None &&
        bom != cmsys::FStream::BOM_UTF8)
       {
-      cmSystemTools::Error("File starts with a Byte-Order-Mark "
-                           "that is not UTF-8 ",
-                           sinfile.c_str());
+      cmOStringStream e;
+      e << "File starts with a Byte-Order-Mark that is not UTF-8 " << sinfile;
+      this->IssueMessage(cmake::FATAL_ERROR, e.str());
       return 0;
       }
     // rewind to copy BOM to output file
diff --git a/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt b/Tests/RunCMake/configure_file/UTF16BE-BOM-stderr.txt
index 1dff60e..eb6e08f 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: File starts with a Byte-Order-Mark that is not UTF-8 .*/configure_file/UTF16BE-BOM.txt.in
 CMake Error at UTF16BE-BOM.cmake:2 \(configure_file\):
-  configure_file Problem configuring file
+  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\):
   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 85b5f83..d2c2429 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: File starts with a Byte-Order-Mark that is not UTF-8 .*/configure_file/UTF16LE-BOM.txt.in
 CMake Error at UTF16LE-BOM.cmake:2 \(configure_file\):
-  configure_file Problem configuring file
+  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\):
   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 7eb46f5..95ff428 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: File starts with a Byte-Order-Mark that is not UTF-8 .*/configure_file/UTF32BE-BOM.txt.in
 CMake Error at UTF32BE-BOM.cmake:2 \(configure_file\):
-  configure_file Problem configuring file
+  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\):
   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 8ea1fe9..b1d4d4a 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: File starts with a Byte-Order-Mark that is not UTF-8 .*/configure_file/UTF32LE-BOM.txt.in
 CMake Error at UTF32LE-BOM.cmake:2 \(configure_file\):
-  configure_file Problem configuring file
+  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\):
   CMakeLists.txt:3 \(include\)

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

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


hooks/post-receive
-- 
CMake