aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Loos <nhuh.put@web.de>2007-08-05 16:22:55 +0000
committerBernhard Loos <nhuh.put@web.de>2007-08-05 16:22:55 +0000
commita768c2bd77cf724c5a09f27d41d453ab5fbd6ae8 (patch)
treefa3b1b4eba1e9b04c1bd2705b9d6c47f8c3bb983
parent7097cddbca41ee8b817a89191db5d39e89ce0b5a (diff)
downloadextra-cmake-modules-a768c2bd77cf724c5a09f27d41d453ab5fbd6ae8.tar.gz
extra-cmake-modules-a768c2bd77cf724c5a09f27d41d453ab5fbd6ae8.tar.bz2
ignore errors from the cmake echo process
(fixes MS VC++ build) svn path=/trunk/KDE/kdelibs/; revision=696684
-rw-r--r--automoc/kde4automoc.cpp25
1 files changed, 15 insertions, 10 deletions
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;