[Cmake-commits] CMake branch, next, updated. v2.8.9-130-g84ec0ee

[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  84ec0eee461f97f0f80dd522153ed000cf3a4216 (commit)
       via  3632f24f1320deed85b574f016bcf7ad0e9f5df5 (commit)
       via  186e9bdc22256039948338d91ab3be02893ab17a (commit)
      from  dbb747aad856fc914236429edaa2881b62048dab (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=84ec0eee461f97f0f80dd522153ed000cf3a4216
commit 84ec0eee461f97f0f80dd522153ed000cf3a4216
Merge: dbb747a 3632f24
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Fri Aug 17 05:06:47 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 17 05:06:47 2012 -0400

    Merge topic 'cmcldeps-needs-cl' into next
    
    3632f24 Ninja: cmcldeps needs a compiler
    186e9bd CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3632f24f1320deed85b574f016bcf7ad0e9f5df5
commit 3632f24f1320deed85b574f016bcf7ad0e9f5df5
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Fri Aug 17 10:56:31 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Fri Aug 17 11:05:47 2012 +0200

    Ninja: cmcldeps needs a compiler

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 3532c8b..793dfa0 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -354,7 +354,9 @@ cmNinjaTargetGenerator
       // TODO but why doesn't it work with cmcldeps?
       const std::string projectName  = mf->GetProjectName() ?
                                        mf->GetProjectName() : "";
-      if (projectName != "CMAKE_TRY_COMPILE")
+      if (projectName != "CMAKE_TRY_COMPILE"
+          && (mf->GetDefinition("CMAKE_C_COMPILER") ||
+              mf->GetDefinition("CMAKE_CXX_COMPILER")))
         {
         useClDeps = true;
         std::string qu = "\"";
@@ -399,9 +401,10 @@ cmNinjaTargetGenerator
   if(useClDeps)
     {
     std::string cl = mf->GetDefinition("CMAKE_C_COMPILER");
-    cl = "\"" + cl + "\" ";
-    cmdLine =   clDepsBinary + " " + lang + " $in \"$DEP_FILE\" $out "
-              + clShowPrefix + " " + cl   + cmdLine;
+    if (cl.empty())
+      cl = mf->GetDefinition("CMAKE_CXX_COMPILER");
+    cmdLine =   clDepsBinary + " "   + lang + " $in \"$DEP_FILE\" $out "
+              + clShowPrefix + " \"" + cl   + "\" " + cmdLine;
     }
 
   // Write the rule for compiling file of the given language.

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

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/cmNinjaTargetGenerator.cxx |   11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake