From a768c2bd77cf724c5a09f27d41d453ab5fbd6ae8 Mon Sep 17 00:00:00 2001
From: Bernhard Loos <nhuh.put@web.de>
Date: Sun, 5 Aug 2007 16:22:55 +0000
Subject: ignore errors from the cmake echo process (fixes MS VC++ build)
svn path=/trunk/KDE/kdelibs/; revision=696684
---
automoc/kde4automoc.cpp | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
(limited to 'automoc/kde4automoc.cpp')
diff --git a/automoc/kde4automoc.cpp b/automoc/kde4automoc.cpp
index 5d0a9a03..9b3ea048 100644
--- a/automoc/kde4automoc.cpp
+++ b/automoc/kde4automoc.cpp
@@ -258,16 +258,21 @@ void AutoMoc::waitForProcesses()
{
while (!processes.isEmpty()) {
Process proc = processes.dequeue();
- if (!proc.qproc->waitForFinished()) {
- cerr << "kde4automoc: process failed: " << proc.qproc->errorString() << endl;
- failed = true;
- if (!proc.mocFilePath.isEmpty()) {
- QFile::remove(proc.mocFilePath);
- }
- } else if (proc.qproc->exitCode() != 0) {
- failed = true;
- if (!proc.mocFilePath.isEmpty()) {
- QFile::remove(proc.mocFilePath);
+
+ bool result = proc.qproc->waitForFinished();
+ //ignore errors from the cmake echo process
+ if (!proc.mocFilePath.isEmpty()) {
+ if (!result) {
+ cerr << "kde4automoc: process failed: " << proc.qproc->errorString() << endl;
+ failed = true;
+ if (!proc.mocFilePath.isEmpty()) {
+ QFile::remove(proc.mocFilePath);
+ }
+ } else if (proc.qproc->exitCode() != 0) {
+ failed = true;
+ if (!proc.mocFilePath.isEmpty()) {
+ QFile::remove(proc.mocFilePath);
+ }
}
}
delete proc.qproc;
--
cgit v1.2.1