kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

automoc: better error handling (#13299) 

automoc now fails immediately if moc fails, instead of continuing
and letting the build fail later on.

Alex
This commit is contained in:
Alex Neundorf 2012-06-14 22:27:22 +02:00
parent 7717d964b8
commit e4a2d5f9ee
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmQtAutomoc.cxx
View File

@ -245,6 +245,7 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
bool cmQtAutomoc::Run(const char* targetDirectory) bool cmQtAutomoc::Run(const char* targetDirectory)
{ {
bool success = true;
cmake cm; cmake cm;
cmGlobalGenerator* gg = this->CreateGlobalGenerator(&cm, targetDirectory); cmGlobalGenerator* gg = this->CreateGlobalGenerator(&cm, targetDirectory);
cmMakefile* makefile = gg->GetCurrentLocalGenerator()->GetMakefile(); cmMakefile* makefile = gg->GetCurrentLocalGenerator()->GetMakefile();
@ -256,7 +257,7 @@ bool cmQtAutomoc::Run(const char* targetDirectory)
if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5") if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
{ {
this->RunAutomoc(); success = this->RunAutomoc();
} }
this->WriteOldMocDefinitionsFile(targetDirectory); this->WriteOldMocDefinitionsFile(targetDirectory);
@ -264,7 +265,7 @@ bool cmQtAutomoc::Run(const char* targetDirectory)
delete gg; delete gg;
gg = NULL; gg = NULL;
makefile = NULL; makefile = NULL;
return true; return success;
} }
@ -578,7 +579,7 @@ bool cmQtAutomoc::RunAutomoc()
if (this->RunMocFailed) if (this->RunMocFailed)
{ {
std::cerr << "returning failed.."<< std::endl; std::cerr << "moc failed..."<< std::endl;
return false; return false;
} }
outStream.flush(); outStream.flush();

4
Source/cmake.cxx
View File

@ -1699,8 +1699,8 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
else if (args[1] == "cmake_automoc") else if (args[1] == "cmake_automoc")
{ {
cmQtAutomoc automoc; cmQtAutomoc automoc;
automoc.Run(args[2].c_str()); bool automocSuccess = automoc.Run(args[2].c_str());
return 0; return automocSuccess ? 0 : 1;
} }
#endif #endif