[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1435-g169eb36

[Ben Boeckel]

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  169eb36490d93a84594a617bc607d31915006d06 (commit)
       via  9523d2a55c99fb0910531ae7160b099faeab6638 (commit)
      from  4d8370c173fa1191a47dcf3956d75e53756f12e3 (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=169eb36490d93a84594a617bc607d31915006d06
commit 169eb36490d93a84594a617bc607d31915006d06
Merge: 4d8370c 9523d2a
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Mar 24 16:41:30 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 24 16:41:30 2014 -0400

    Merge topic 'dev/custom-ninja-deptypes' into next
    
    9523d2a5 ninja: Add support for custom depfile formats


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9523d2a55c99fb0910531ae7160b099faeab6638
commit 9523d2a55c99fb0910531ae7160b099faeab6638
Author:     Ben Boeckel <mathstuf at gmail.com>
AuthorDate: Sun Mar 23 23:47:56 2014 -0400
Commit:     Ben Boeckel <mathstuf at gmail.com>
CommitDate: Sun Mar 23 23:54:13 2014 -0400

    ninja: Add support for custom depfile formats
    
    Not everything that isn't MSVC is GCC. I have support for LDC's depfile
    format on its way upstream[1], but its future is uncertain. CMake should
    at least support this for future depfile formats.
    
    [1]https://github.com/martine/ninja/pull/721

diff --git a/Help/release/dev/custom-ninja-deptypes.rst b/Help/release/dev/custom-ninja-deptypes.rst
new file mode 100644
index 0000000..7750da8
--- /dev/null
+++ b/Help/release/dev/custom-ninja-deptypes.rst
@@ -0,0 +1,5 @@
+custom-ninja-deptypes
+---------------------
+
+* Add a `CMAKE_NINJA_DEPTYPE_<LANG>` variable so that compilers may set the
+  deptype for use in Ninja other than those CMake itself knows about.
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 4319f3c..8865b3d 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -418,6 +418,11 @@ cmNinjaTargetGenerator
   else
     {
     deptype = "gcc";
+    const char* langdeptype = mf->GetDefinition("CMAKE_NINJA_DEPTYPE_" + lang);
+    if (langdeptype)
+      {
+      deptype = langdeptype;
+      }
     depfile = "$DEP_FILE";
     const std::string flagsName = "CMAKE_DEPFILE_FLAGS_" + lang;
     std::string depfileFlags = mf->GetSafeDefinition(flagsName);

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

Summary of changes:
 Help/release/dev/custom-ninja-deptypes.rst |    5 +++++
 Source/cmNinjaTargetGenerator.cxx          |    5 +++++
 2 files changed, 10 insertions(+)
 create mode 100644 Help/release/dev/custom-ninja-deptypes.rst


hooks/post-receive
-- 
CMake