summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-05 07:47:36 -0500
committerBrad King <brad.king@kitware.com>2013-11-05 07:47:36 -0500
commit850276d2b445aecc19c48c764865fc697d87739c (patch)
treeed814267198f06dbd5aec5d719d714ef1aa9ef9d
parentb84854676b23cf91cb132c61ad9618f4c8c37124 (diff)
parent9ef66f2b0fc86e1a4c2ae532cbb32db137ef5ffe (diff)
downloadcmake-850276d2b445aecc19c48c764865fc697d87739c.tar.gz
Merge branch 'cmake-E-automoc-crash' into release
-rw-r--r--Source/cmake.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 290aff05cb..14ddc1b014 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1734,7 +1734,7 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
{
return cmake::ExecuteEchoColor(args);
}
- else if (args[1] == "cmake_automoc")
+ else if (args[1] == "cmake_automoc" && args.size() >= 4)
{
cmQtAutomoc automoc;
const char *config = args[3].empty() ? 0 : args[3].c_str();