[Cmake-commits] CMake branch, next, updated. v2.8.12-4830-g0c95f28

[Peter Kuemmel]

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  0c95f285c0a98d3b3beb7af7a753150d1c08081f (commit)
       via  f212615d3e799edc57128bccdc501120d753c6ee (commit)
       via  e405380d06052ca7e86ab9ca297f3e89fe866932 (commit)
      from  7e551ebaa64302843d31770fa0e116f931b5bb3d (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=0c95f285c0a98d3b3beb7af7a753150d1c08081f
commit 0c95f285c0a98d3b3beb7af7a753150d1c08081f
Merge: 7e551eb f212615
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 4 07:21:19 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 4 07:21:19 2013 -0500

    Merge topic 'ninja-dont-parse-empty-depsflag' into next
    
    f212615 Ninja: don't parse empty string
    e405380 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f212615d3e799edc57128bccdc501120d753c6ee
commit f212615d3e799edc57128bccdc501120d753c6ee
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 4 13:18:47 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Nov 4 13:20:27 2013 +0100

    Ninja: don't parse empty string

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index a6f8159..26eadbe 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -398,11 +398,14 @@ cmNinjaTargetGenerator
     depfile = "$DEP_FILE";
     const std::string flagsName = "CMAKE_DEPFILE_FLAGS_" + lang;
     std::string depfileFlags = mf->GetSafeDefinition(flagsName.c_str());
-    cmSystemTools::ReplaceString(depfileFlags, "<DEPFILE>", "$DEP_FILE");
-    cmSystemTools::ReplaceString(depfileFlags, "<OBJECT>",  "$out");
-    cmSystemTools::ReplaceString(depfileFlags, "<CMAKE_C_COMPILER>",
-                                 mf->GetDefinition("CMAKE_C_COMPILER"));
-    flags += " " + depfileFlags;
+    if (!depfileFlags.empty())
+      {
+      cmSystemTools::ReplaceString(depfileFlags, "<DEPFILE>", "$DEP_FILE");
+      cmSystemTools::ReplaceString(depfileFlags, "<OBJECT>",  "$out");
+      cmSystemTools::ReplaceString(depfileFlags, "<CMAKE_C_COMPILER>",
+                                   mf->GetDefinition("CMAKE_C_COMPILER"));
+      flags += " " + depfileFlags;
+      }
     }
 
   vars.Flags = flags.c_str();

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

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmNinjaTargetGenerator.cxx |   13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake