[Cmake-commits] CMake branch, next, updated. v3.0.0-4751-gf197197

[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  f1971971c9c23f1d2819d64e189ce01a15362ac4 (commit)
       via  414a1b6e13766a73dd1c7618465d0bcc57a80805 (commit)
      from  6562e3204db04bf6f5256b090db751d0ca9136dd (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=f1971971c9c23f1d2819d64e189ce01a15362ac4
commit f1971971c9c23f1d2819d64e189ce01a15362ac4
Merge: 6562e32 414a1b6
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Aug 4 14:26:37 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 4 14:26:37 2014 -0400

    Merge topic 'file-strings-encoding' into next
    
    414a1b6e cmFileCommand: Fix style and compile issues.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=414a1b6e13766a73dd1c7618465d0bcc57a80805
commit 414a1b6e13766a73dd1c7618465d0bcc57a80805
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Aug 4 12:26:13 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Aug 4 12:26:13 2014 -0600

    cmFileCommand: Fix style and compile issues.

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 52571e2..d55c44b 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -682,7 +682,7 @@ bool cmFileCommand::HandleStringsCommand(std::vector<std::string> const& args)
           c = current_str[current_str.size() - 1 - j];
           fin.putback(c);
           }
-        current_str.clear();
+        current_str = "";
         }
       }
 
diff --git a/Tests/StringFileTest/CMakeLists.txt b/Tests/StringFileTest/CMakeLists.txt
index 2107488..683f969 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 UTF-8)
+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:
 Source/cmFileCommand.cxx            |    2 +-
 Tests/StringFileTest/CMakeLists.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake