[Cmake-commits] CMake branch, next, updated. v3.1.1-2562-g9fad1bd

[Stephen Kelly]

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  9fad1bd5aef1d7c46dff587febd66808781e88ad (commit)
       via  2fed8e173cbd8c897b0cf2fd46ec72fedc3c43ed (commit)
      from  dc5bd78ae99b4851dbc505ec5a47622c7045ff9e (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=9fad1bd5aef1d7c46dff587febd66808781e88ad
commit 9fad1bd5aef1d7c46dff587febd66808781e88ad
Merge: dc5bd78 2fed8e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 16:56:02 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 3 16:56:02 2015 -0500

    Merge topic 'Qt-AUTOUIC-file-origin' into next
    
    2fed8e17 QtAutogen: Issue error message with origin file (#15342).


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2fed8e173cbd8c897b0cf2fd46ec72fedc3c43ed
commit 2fed8e173cbd8c897b0cf2fd46ec72fedc3c43ed
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Feb 3 22:52:17 2015 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Feb 3 22:52:17 2015 +0100

    QtAutogen: Issue error message with origin file (#15342).

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index bf79066..e18e757 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -2243,7 +2243,8 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
     if (!result || retVal)
       {
       std::cerr << "AUTOUIC: error: process for " << ui_output_file <<
-                " failed:\n" << output << std::endl;
+                " needed by\n \"" << realName << "\"\nfailed:\n" << output
+                << std::endl;
       this->RunUicFailed = true;
       cmSystemTools::RemoveFile(ui_output_file);
       return false;

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake