[Cmake-commits] CMake branch, next, updated. v3.6.2-2656-g7a615de

[Brad King]

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  7a615de1c279b12dc0419571f4a6b1a82e1d9cdc (commit)
       via  a189d019dd2cc3a56fc57ae1162b752ff0811551 (commit)
      from  4d42faf205e28bf47a38ac2168e24842f44f9219 (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=7a615de1c279b12dc0419571f4a6b1a82e1d9cdc
commit 7a615de1c279b12dc0419571f4a6b1a82e1d9cdc
Merge: 4d42faf a189d01
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 30 10:14:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 30 10:14:51 2016 -0400

    Merge topic 'autogen-fix-cmake-error' into next
    
    a189d019 QtAutogen: Use cmSystemTools::Error instead of std::cerr


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a189d019dd2cc3a56fc57ae1162b752ff0811551
commit a189d019dd2cc3a56fc57ae1162b752ff0811551
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Sep 30 10:58:48 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 30 10:12:59 2016 -0400

    QtAutogen: Use cmSystemTools::Error instead of std::cerr
    
    We can use std::cerr only in the build-time tool, not during CMake
    generation.

diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx
index f5936bf..5246a67 100644
--- a/Source/cmQtAutoGeneratorInitializer.cxx
+++ b/Source/cmQtAutoGeneratorInitializer.cxx
@@ -478,7 +478,7 @@ static bool ListQt5RccInputs(cmSourceFile* sf, cmGeneratorTarget const* target,
         << " failed:\n"
         << rccStdOut << "\n"
         << rccStdErr << std::endl;
-    std::cerr << err.str();
+    cmSystemTools::Error(err.str().c_str());
     return false;
   }
 
@@ -507,7 +507,7 @@ static bool ListQt5RccInputs(cmSourceFile* sf, cmGeneratorTarget const* target,
           std::ostringstream err;
           err << "AUTOGEN: error: Rcc lists unparsable output " << eline
               << std::endl;
-          std::cerr << err.str();
+          cmSystemTools::Error(err.str().c_str());
           return false;
         }
         pos += searchString.length();

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

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


hooks/post-receive
-- 
CMake