[Cmake-commits] CMake branch, next, updated. v3.0.0-4749-g6562e32

[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  6562e3204db04bf6f5256b090db751d0ca9136dd (commit)
       via  5493ba5ec8d5ea156c3ea8f0d1e1805a7f6dadf3 (commit)
      from  7b81cf8943c519fa76c781afdcdc54eac08b3bfb (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=6562e3204db04bf6f5256b090db751d0ca9136dd
commit 6562e3204db04bf6f5256b090db751d0ca9136dd
Merge: 7b81cf8 5493ba5
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Aug 4 13:31:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 4 13:31:28 2014 -0400

    Merge topic 'file-strings-encoding' into next
    
    5493ba5e cmFileCommand: Change "UTF8" argument to "UTF-8"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5493ba5ec8d5ea156c3ea8f0d1e1805a7f6dadf3
commit 5493ba5ec8d5ea156c3ea8f0d1e1805a7f6dadf3
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Aug 4 11:30:09 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Aug 4 11:30:09 2014 -0600

    cmFileCommand: Change "UTF8" argument to "UTF-8"

diff --git a/Help/command/file.rst b/Help/command/file.rst
index 5f93686..dbc4149 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -65,7 +65,7 @@ Parse a list of ASCII strings from ``<filename>`` and store it in
  Consider only strings that match the given regular expression.
 
 ``ENCODING <encoding-type>``
- Consider strings of a given encoding.  "UTF8" is currently supported.
+ Consider strings of a given encoding.  "UTF-8" is currently supported.
 
 For example, the code
 
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 34c0d73..52571e2 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -564,7 +564,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
       }
     else if(arg_mode == arg_encoding)
       {
-      if(args[i] == "UTF8")
+      if(args[i] == "UTF-8")
         {
         utf8_encoding = true;
         }
diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index c46bef6..2107488 100644
--- a/Tests/StringFileTest/CMakeLists.txt
+++ b/Tests/StringFileTest/CMakeLists.txt
@@ -56,7 +56,7 @@ else()
 endif()
 
 #this file has utf-8 content
-FILE(STRINGS test.utf8 infile_strings ENCODING UTF8)
+FILE(STRINGS test.utf8 infile_strings ENCODING UTF-8)
 list(LENGTH infile_strings content_len)
 if(content_len MATCHES "3")
   message("file(STRINGS) correctly read from utf8 file [${infile_strings}]")

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

Summary of changes:
 Help/command/file.rst               |    2 +-
 Source/cmFileCommand.cxx            |    2 +-
 Tests/StringFileTest/CMakeLists.txt |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake