reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-25 04:29:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Autogen: Generate moc_predefs.h only on demand

Browse Source
This commit is contained in:
Sebastian Holtermann 2017-04-22 14:39:50 +02:00
parent 1d5ed679ce
commit 7c5f5f1a20
2 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Source/cmQtAutoGenerators.cxx
View File

@ -248,6 +248,7 @@ cmQtAutoGenerators::cmQtAutoGenerators()
: Verbose(cmsys::SystemTools::HasEnv("VERBOSE"))
, ColorOutput(true)
, MocSettingsChanged(false)
, MocPredefsChanged(false)
, MocRunFailed(false)
, UicSettingsChanged(false)
, UicRunFailed(false)
@ -520,6 +521,8 @@ void cmQtAutoGenerators::SettingsFileRead(cmMakefile* makefile)
str += " ~~~ ";
str += this->IncludeProjectDirsBefore ? "TRUE" : "FALSE";
str += " ~~~ ";
str += JoinOptionsList(this->MocPredefsCmd);
str += " ~~~ ";
}
if (this->UicEnabled()) {
std::string& str = this->SettingsStringUic;
@ -1186,40 +1189,48 @@ bool cmQtAutoGenerators::MocGenerateAll(
// Generate moc_predefs
if (!this->MocPredefsCmd.empty()) {
this->LogBold("Generating MOC predefs " + this->MocPredefsFileRel);
if (this->MocSettingsChanged ||
FileAbsentOrOlder(this->MocPredefsFileAbs, this->SettingsFile)) {
this->LogBold("Generating MOC predefs " + this->MocPredefsFileRel);
std::string output;
{
std::vector<std::string> cmd = this->MocPredefsCmd;
// Add includes
cmd.insert(cmd.end(), this->MocIncludes.begin(),
this->MocIncludes.end());
// Add definitions
for (std::vector<std::string>::const_iterator it =
this->MocDefinitions.begin();
it != this->MocDefinitions.end(); ++it) {
cmd.push_back("-D" + (*it));
std::string output;
{
// Compose command
std::vector<std::string> cmd = this->MocPredefsCmd;
// Add includes
cmd.insert(cmd.end(), this->MocIncludes.begin(),
this->MocIncludes.end());
// Add definitions
for (std::vector<std::string>::const_iterator it =
this->MocDefinitions.begin();
it != this->MocDefinitions.end(); ++it) {
cmd.push_back("-D" + (*it));
#ifdef _WIN32
cmd.push_back("-DWIN32");
cmd.push_back("-DWIN32");
#endif
}
// Add options
cmd.insert(cmd.end(), this->MocOptions.begin(), this->MocOptions.end());
if (!this->RunCommand(cmd, output, false)) {
{
std::ostringstream ost;
ost << "AutoMoc: Error: moc predefs generation command failed\n";
ost << "AutoMoc: Command:\n" << QuotedCommand(cmd) << "\n";
ost << "AutoMoc: Command output:\n" << output << "\n";
this->LogError(ost.str());
}
return false;
// Add options
cmd.insert(cmd.end(), this->MocOptions.begin(),
this->MocOptions.end());
// Execute command
if (!this->RunCommand(cmd, output, false)) {
{
std::ostringstream ost;
ost << "AutoMoc: Error: moc predefs generation command failed\n";
ost << "AutoMoc: Command:\n" << QuotedCommand(cmd) << "\n";
ost << "AutoMoc: Command output:\n" << output << "\n";
this->LogError(ost.str());
}
return false;
}
}
}
if (this->FileDiffers(this->MocPredefsFileAbs, output)) {
if (!this->FileWrite("AutoMoc", this->MocPredefsFileAbs, output)) {
return false;
// (Re)write predefs file only on demand
if (this->FileDiffers(this->MocPredefsFileAbs, output)) {
if (this->FileWrite("AutoMoc", this->MocPredefsFileAbs, output)) {
this->MocPredefsChanged = true;
} else {
return false;
}
}
}
}
@ -1300,7 +1311,7 @@ bool cmQtAutoGenerators::MocGenerateFile(
const std::map<std::string, std::set<std::string> >& mocDepends)
{
bool mocGenerated = false;
bool generateMoc = this->MocSettingsChanged;
bool generateMoc = this->MocSettingsChanged || this->MocPredefsChanged;
const std::string mocFileRel =
this->AutogenBuildSubDir + subDir + mocFileName;

1
Source/cmQtAutoGenerators.h
View File

@ -186,6 +186,7 @@ private:
std::string SettingsStringRcc;
// -- Moc
bool MocSettingsChanged;
bool MocPredefsChanged;
bool MocRelaxedMode;
bool MocRunFailed;
std::string MocCppFilenameRel;