summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-23 01:00:07 (GMT)
committerBrad King <brad.king@kitware.com>2014-12-23 01:00:07 (GMT)
commit62b19984039235d5325ee1ad6a7643a4ccd696a8 (patch)
treeb46d571d31d4c4f84bfeacddb3fa9e77f8e53474
parentd62733b48a7360ffd62a2da4148f717c874da36c (diff)
parent9a13fcbf02e16bda1b8d30332c97ea9460306e4d (diff)
downloadCMake-62b19984039235d5325ee1ad6a7643a4ccd696a8.zip
CMake-62b19984039235d5325ee1ad6a7643a4ccd696a8.tar.gz
CMake-62b19984039235d5325ee1ad6a7643a4ccd696a8.tar.bz2
Merge branch 'ninja-fix-crash-on-error' into release
-rw-r--r--Source/cmNinjaTargetGenerator.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 816e6d8..b8cc5fb 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -454,7 +454,10 @@ cmNinjaTargetGenerator
std::vector<std::string> compileCmds;
cmSystemTools::ExpandListArgument(compileCmd, compileCmds);
- compileCmds.front().insert(0, cldeps);
+ if (!compileCmds.empty())
+ {
+ compileCmds.front().insert(0, cldeps);
+ }
for (std::vector<std::string>::iterator i = compileCmds.begin();
i != compileCmds.end(); ++i)