Merge branch 'cmake-E-automoc-crash' into release
This commit is contained in:
commit
850276d2b4
|
@ -1734,7 +1734,7 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
|
||||||
{
|
{
|
||||||
return cmake::ExecuteEchoColor(args);
|
return cmake::ExecuteEchoColor(args);
|
||||||
}
|
}
|
||||||
else if (args[1] == "cmake_automoc")
|
else if (args[1] == "cmake_automoc" && args.size() >= 4)
|
||||||
{
|
{
|
||||||
cmQtAutomoc automoc;
|
cmQtAutomoc automoc;
|
||||||
const char *config = args[3].empty() ? 0 : args[3].c_str();
|
const char *config = args[3].empty() ? 0 : args[3].c_str();
|
||||||
|
|
Loading…
Reference in New Issue