reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-13 22:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AUTOGEN: Generators: Be verbose about skipping files

Browse Source
This commit is contained in:
Sebastian Holtermann 2016-12-31 11:51:39 +01:00
parent de53143288
commit 966be439e0
1 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Source/cmQtAutoGenerators.cxx
View File

@ -607,11 +607,20 @@ void cmQtAutoGenerators::ParseContentForUic(
const std::string& absFilename, const std::string& contentsString,
std::map<std::string, std::vector<std::string> >& includedUis)
{
if (this->UicExecutable.empty() ||
ListContains(this->SkipUic, absFilename)) {
if (this->UicExecutable.empty()) {
return;
}
// Check skip list
if (ListContains(this->SkipUic, absFilename)) {
if (this->Verbose) {
std::ostringstream err;
err << "AUTOUIC: Skipping " << absFilename << "\n";
this->LogInfo(err.str());
}
return;
}
// Process
if (this->Verbose) {
std::ostringstream err;
err << "AUTOUIC: Checking " << absFilename << "\n";
@ -641,11 +650,20 @@ bool cmQtAutoGenerators::ParseContentForMoc(
const std::vector<std::string>& headerExtensions,
std::map<std::string, std::string>& includedMocs, bool relaxed)
{
if (this->MocExecutable.empty() ||
ListContains(this->SkipMoc, absFilename)) {
if (this->MocExecutable.empty()) {
return true;
}
// Check skip list
if (ListContains(this->SkipMoc, absFilename)) {
if (this->Verbose) {
std::ostringstream err;
err << "AUTOMOC: Skipping " << absFilename << "\n";
this->LogInfo(err.str());
}
return true;
}
// Process
if (this->Verbose) {
std::ostringstream err;
err << "AUTOMOC: Checking " << absFilename << "\n";
@ -872,21 +890,28 @@ void cmQtAutoGenerators::ParseHeaders(
// Parse header content for MOC
if (!this->MocExecutable.empty() &&
!ListContains(this->SkipMoc, headerName) &&
(includedMocs.find(headerName) == includedMocs.end())) {
if (this->Verbose) {
std::ostringstream err;
err << "AUTOMOC: Checking " << headerName << "\n";
this->LogInfo(err.str());
}
std::string macroName;
if (this->requiresMocing(contents, macroName)) {
notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) +
"/moc_" +
cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) +
".cpp";
if (ListContains(this->SkipMoc, headerName)) {
// Skip
if (this->Verbose) {
std::ostringstream err;
err << "AUTOMOC: Skipping " << headerName << "\n";
this->LogInfo(err.str());
}
} else {
// Process
if (this->Verbose) {
std::ostringstream err;
err << "AUTOMOC: Checking " << headerName << "\n";
this->LogInfo(err.str());
}
std::string macroName;
if (this->requiresMocing(contents, macroName)) {
notIncludedMocs[headerName] = fpathCheckSum.getPart(headerName) +
"/moc_" +
cmsys::SystemTools::GetFilenameWithoutLastExtension(headerName) +
".cpp";
}
}
}