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

Rename the cmQtAutoGenerator instances to reflect coming features.

This commit is contained in:
Stephen Kelly 2013-10-02 13:39:50 +02:00
parent 5c058c8f12
commit 52d5d4e915
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmGlobalGenerator.cxx
View File

@ -1209,8 +1209,8 @@ bool cmGlobalGenerator::CheckTargets()
void cmGlobalGenerator::CreateQtAutoGeneratorsTargets() void cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
{ {
#ifdef CMAKE_BUILD_WITH_CMAKE #ifdef CMAKE_BUILD_WITH_CMAKE
typedef std::vector<std::pair<cmQtAutoGenerators, cmTarget*> > Automocs; typedef std::vector<std::pair<cmQtAutoGenerators, cmTarget*> > Autogens;
Automocs automocs; Autogens autogens;
for(unsigned int i=0; i < this->LocalGenerators.size(); ++i) for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
{ {
cmTargets& targets = cmTargets& targets =
@ -1227,16 +1227,16 @@ void cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
{ {
if(target.GetPropertyAsBool("AUTOMOC") && !target.IsImported()) if(target.GetPropertyAsBool("AUTOMOC") && !target.IsImported())
{ {
cmQtAutoGenerators automoc; cmQtAutoGenerators autogen;
if(automoc.InitializeMocSourceFile(&target)) if(autogen.InitializeMocSourceFile(&target))
{ {
automocs.push_back(std::make_pair(automoc, &target)); autogens.push_back(std::make_pair(autogen, &target));
} }
} }
} }
} }
} }
for (Automocs::iterator it = automocs.begin(); it != automocs.end(); for (Autogens::iterator it = autogens.begin(); it != autogens.end();
++it) ++it)
{ {
it->first.SetupAutoGenerateTarget(it->second); it->first.SetupAutoGenerateTarget(it->second);

6
Source/cmcmd.cxx
View File

@ -634,10 +634,10 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
} }
else if (args[1] == "cmake_automoc") else if (args[1] == "cmake_automoc")
{ {
cmQtAutoGenerators automoc; cmQtAutoGenerators autogen;
const char *config = args[3].empty() ? 0 : args[3].c_str(); const char *config = args[3].empty() ? 0 : args[3].c_str();
bool automocSuccess = automoc.Run(args[2].c_str(), config); bool autogenSuccess = autogen.Run(args[2].c_str(), config);
return automocSuccess ? 0 : 1; return autogenSuccess ? 0 : 1;
} }
#endif #endif