[Cmake-commits] CMake branch, next, updated. v3.1.0-1354-gf37cc80

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f37cc80bffc7f2fabe0ffb0c290cd19384a88b7f (commit)
       via  9a13fcbf02e16bda1b8d30332c97ea9460306e4d (commit)
      from  6248f5525545334114f2eed43499a415e40977c8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f37cc80bffc7f2fabe0ffb0c290cd19384a88b7f
commit f37cc80bffc7f2fabe0ffb0c290cd19384a88b7f
Merge: 6248f55 9a13fcb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 22 18:36:44 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 22 18:36:44 2014 -0500

    Merge topic 'ninja-fix-crash-on-error' into next
    
    9a13fcbf Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a13fcbf02e16bda1b8d30332c97ea9460306e4d
commit 9a13fcbf02e16bda1b8d30332c97ea9460306e4d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 22 18:34:28 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 22 18:36:07 2014 -0500

    Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325)

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)

-----------------------------------------------------------------------

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake