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

Fix bootstrap test with automoc 

Alex
This commit is contained in:
Alex Neundorf 2011-08-17 17:08:50 +02:00
parent afb3edc181
commit 71c29d11b3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalGenerator.cxx
View File

@ -958,6 +958,7 @@ bool cmGlobalGenerator::CheckTargets()
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGlobalGenerator::CreateAutomocTargets() void cmGlobalGenerator::CreateAutomocTargets()
{ {
#ifdef CMAKE_BUILD_WITH_CMAKE
for(unsigned int i=0; i < this->LocalGenerators.size(); ++i) for(unsigned int i=0; i < this->LocalGenerators.size(); ++i)
{ {
cmTargets& targets = cmTargets& targets =
@ -979,6 +980,7 @@ void cmGlobalGenerator::CreateAutomocTargets()
} }
} }
} }
#endif
} }

3
Source/cmake.cxx
View File

@ -1573,14 +1573,13 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
{ {
return cmake::ExecuteEchoColor(args); return cmake::ExecuteEchoColor(args);
} }
#endif
else if (args[1] == "cmake_automoc") else if (args[1] == "cmake_automoc")
{ {
cmQtAutomoc automoc; cmQtAutomoc automoc;
automoc.Run(args[2].c_str()); automoc.Run(args[2].c_str());
return 0; return 0;
} }
#endif
// Tar files // Tar files
else if (args[1] == "tar" && args.size() > 3) else if (args[1] == "tar" && args.size() > 3)