reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-14 23:29:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AUTOGEN: Generators: Do moc/uic skip test during file list generation

Browse Source
This commit is contained in:
Sebastian Holtermann 2017-01-04 13:32:11 +01:00
parent a84f0bb726
commit 0699760d5c
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/cmQtAutoGenerators.cxx
View File

@ -534,8 +534,16 @@ bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
} }
// Parse headers // Parse headers
headerFilesMoc.insert(this->Headers.begin(), this->Headers.end()); for (std::vector<std::string>::const_iterator it = this->Headers.begin();
headerFilesUic.insert(this->Headers.begin(), this->Headers.end()); it != this->Headers.end(); ++it) {
const std::string& headerName = *it;
if (!this->MocSkipTest(headerName)) {
headerFilesMoc.insert(this->Headers.begin(), this->Headers.end());
}
if (!this->UicSkipTest(headerName)) {
headerFilesUic.insert(this->Headers.begin(), this->Headers.end());
}
}
this->ParseHeaders(headerFilesMoc, headerFilesUic, includedMocs, this->ParseHeaders(headerFilesMoc, headerFilesUic, includedMocs,
notIncludedMocs, includedUis); notIncludedMocs, includedUis);
@ -577,10 +585,12 @@ bool cmQtAutoGenerators::ParseSourceFile(
this->LogWarning(err.str()); this->LogWarning(err.str());
} else { } else {
// Parse source contents for MOC // Parse source contents for MOC
success = this->ParseContentForMoc( if (success && !this->MocSkipTest(absFilename)) {
absFilename, contentsString, headerExtensions, includedMocs, relaxed); success = this->ParseContentForMoc(
absFilename, contentsString, headerExtensions, includedMocs, relaxed);
}
// Parse source contents for UIC // Parse source contents for UIC
if (success) { if (success && !this->UicSkipTest(absFilename)) {
this->ParseContentForUic(absFilename, contentsString, includedUis); this->ParseContentForUic(absFilename, contentsString, includedUis);
} }
} }
@ -610,10 +620,6 @@ void cmQtAutoGenerators::ParseContentForUic(
const std::string& absFilename, const std::string& contentsString, const std::string& absFilename, const std::string& contentsString,
std::map<std::string, std::vector<std::string> >& includedUis) std::map<std::string, std::vector<std::string> >& includedUis)
{ {
if (this->UicSkipTest(absFilename)) {
return;
}
// Process // Process
if (this->Verbose) { if (this->Verbose) {
std::ostringstream err; std::ostringstream err;
@ -644,10 +650,6 @@ bool cmQtAutoGenerators::ParseContentForMoc(
const std::vector<std::string>& headerExtensions, const std::vector<std::string>& headerExtensions,
std::map<std::string, std::string>& includedMocs, bool relaxed) std::map<std::string, std::string>& includedMocs, bool relaxed)
{ {
if (this->MocSkipTest(absFilename)) {
return true;
}
// Process // Process
if (this->Verbose) { if (this->Verbose) {
std::ostringstream err; std::ostringstream err;
@ -895,8 +897,7 @@ void cmQtAutoGenerators::ParseHeaders(
const std::string contents = ReadAll(headerName); const std::string contents = ReadAll(headerName);
// Parse header content for MOC // Parse header content for MOC
if (!this->MocSkipTest(headerName) && if ((absHeadersMoc.find(headerName) != absHeadersMoc.end()) &&
(absHeadersMoc.find(headerName) != absHeadersMoc.end()) &&
(includedMocs.find(headerName) == includedMocs.end())) { (includedMocs.find(headerName) == includedMocs.end())) {
// Process // Process
if (this->Verbose) { if (this->Verbose) {