[Cmake-commits] CMake branch, next, updated. v3.7.0-rc3-1068-g15fb778

Brad King brad.king at kitware.com
Thu Nov 10 11:21:18 EST 2016


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  15fb77871ef8e4617817bdbd6bb3189f7406b551 (commit)
       via  e6a2ab33febc5bf7054776fabbbdb44f716335d5 (commit)
      from  9cd8c198b79646bf9a1f36570ab3b09bc277dc8e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15fb77871ef8e4617817bdbd6bb3189f7406b551
commit 15fb77871ef8e4617817bdbd6bb3189f7406b551
Merge: 9cd8c19 e6a2ab3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 11:21:17 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 10 11:21:17 2016 -0500

    Merge topic 'childEncoding' into next
    
    e6a2ab33 fixup! Windows: Encode child process output to internally-used encoding


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6a2ab33febc5bf7054776fabbbdb44f716335d5
commit e6a2ab33febc5bf7054776fabbbdb44f716335d5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Nov 10 11:21:08 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Nov 10 11:21:08 2016 -0500

    fixup! Windows: Encode child process output to internally-used encoding

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 77afd0f..029594f 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -646,11 +646,11 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command,
 
     if (outputflag != OUTPUT_NONE) {
       processOutput.DecodeText(std::string(), strdata, 1);
-      if (strdata.size() > 0) {
+      if (!strdata.empty()) {
         cmSystemTools::Stdout(strdata.c_str(), strdata.size());
       }
       processOutput.DecodeText(std::string(), strdata, 2);
-      if (strdata.size() > 0) {
+      if (!strdata.empty()) {
         cmSystemTools::Stderr(strdata.c_str(), strdata.size());
       }
     }

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

Summary of changes:
 Source/cmSystemTools.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list