Autogen: Improve error detection during configuration

cmQtAutoGenInitializer::InitCustomTargets and
cmQtAutoGenInitializer::SetupCustomTargets
now return their success value which gets evaluated
and passed on by the caller (cmGlobalGenerator).

Checks for the existance of the moc/uic/rcc
binaries have been introduces in cmQtAutoGenInitializer.
Additionally they get called once with a "-h"
argument to determine if they're functional.
This way any binary-not-found problem is caught
during the configuration phase.

1 files changed, 6 insertions, 2 deletions

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 2872831..c401844 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1318,7 +1318,9 @@ bool cmGlobalGenerator::Compute()
   // the AUTOMOC, AUTOUIC or AUTORCC property set
   auto autogenInits = this->CreateQtAutoGenInitializers();
   for (auto& autoGen : autogenInits) {
-    autoGen->InitCustomTargets();
+    if (!autoGen->InitCustomTargets()) {
+      return false;
+    }
   }
 #endif
 
@@ -1341,7 +1343,9 @@ bool cmGlobalGenerator::Compute()
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
   for (auto& autoGen : autogenInits) {
-    autoGen->SetupCustomTargets();
+    if (!autoGen->SetupCustomTargets()) {
+      return false;
+    }
     autoGen.reset(nullptr);
   }
   autogenInits.clear();