Rename RunAutomoc to RunAutogen.
It will soon be used to process ui and rcc files too.
This commit is contained in:
parent
85b3d6e73d
commit
f371ab5803
|
@ -492,7 +492,7 @@ bool cmQtAutoGenerators::Run(const char* targetDirectory, const char *config)
|
||||||
|
|
||||||
if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
|
if (this->QtMajorVersion == "4" || this->QtMajorVersion == "5")
|
||||||
{
|
{
|
||||||
success = this->RunAutomoc(makefile);
|
success = this->RunAutogen(makefile);
|
||||||
}
|
}
|
||||||
|
|
||||||
this->WriteOldMocDefinitionsFile(targetDirectory);
|
this->WriteOldMocDefinitionsFile(targetDirectory);
|
||||||
|
@ -719,7 +719,7 @@ void cmQtAutoGenerators::Init()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool cmQtAutoGenerators::RunAutomoc(cmMakefile* makefile)
|
bool cmQtAutoGenerators::RunAutogen(cmMakefile* makefile)
|
||||||
{
|
{
|
||||||
if (!cmsys::SystemTools::FileExists(this->OutMocCppFilename.c_str())
|
if (!cmsys::SystemTools::FileExists(this->OutMocCppFilename.c_str())
|
||||||
|| (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr))
|
|| (this->OldCompileSettingsStr != this->CurrentCompileSettingsStr))
|
||||||
|
|
|
@ -44,7 +44,7 @@ private:
|
||||||
|
|
||||||
std::string MakeCompileSettingsString(cmMakefile* makefile);
|
std::string MakeCompileSettingsString(cmMakefile* makefile);
|
||||||
|
|
||||||
bool RunAutomoc(cmMakefile* makefile);
|
bool RunAutogen(cmMakefile* makefile);
|
||||||
bool GenerateMoc(const std::string& sourceFile,
|
bool GenerateMoc(const std::string& sourceFile,
|
||||||
const std::string& mocFileName);
|
const std::string& mocFileName);
|
||||||
void ParseCppFile(const std::string& absFilename,
|
void ParseCppFile(const std::string& absFilename,
|
||||||
|
|
Loading…
Reference in New Issue