From 3632f24f1320deed85b574f016bcf7ad0e9f5df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Fri, 17 Aug 2012 10:56:31 +0200
Subject: [PATCH 1/2] Ninja: cmcldeps needs a compiler

---
 Source/cmNinjaTargetGenerator.cxx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 3532c8ba4..793dfa054 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.

From 4a35bd0e69e5cfaf7ca9604c90b609d1d333bb37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Fri, 17 Aug 2012 16:01:53 +0200
Subject: [PATCH 2/2] Ninja: don't crash on returned 0 pointer

---
 Source/cmNinjaTargetGenerator.cxx | 39 ++++++++++++++-----------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 793dfa054..b6bdfdcdf 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -342,26 +342,26 @@ cmNinjaTargetGenerator
   cmMakefile* mf = this->GetMakefile();
 
   bool useClDeps = false;
+  std::string clBinary;
   std::string clDepsBinary;
   std::string clShowPrefix;
   if (lang == "C" || lang == "CXX" || lang == "RC")
     {
-    const char* depsPtr = mf->GetDefinition("CMAKE_CMCLDEPS_EXECUTABLE");
-    const char* showPtr = mf->GetDefinition("CMAKE_CL_SHOWINCLUDE_PREFIX");
-    if (depsPtr && showPtr)
+    clDepsBinary = mf->GetSafeDefinition("CMAKE_CMCLDEPS_EXECUTABLE");
+    if (!clDepsBinary.empty() &&
+        !this->GetGlobalGenerator()->GetCMakeInstance()->GetIsInTryCompile())
       {
-      // don't wrap for try_compile,
-      // TODO but why doesn't it work with cmcldeps?
-      const std::string projectName  = mf->GetProjectName() ?
-                                       mf->GetProjectName() : "";
-      if (projectName != "CMAKE_TRY_COMPILE"
-          && (mf->GetDefinition("CMAKE_C_COMPILER") ||
-              mf->GetDefinition("CMAKE_CXX_COMPILER")))
+      clShowPrefix = mf->GetSafeDefinition("CMAKE_CL_SHOWINCLUDE_PREFIX");
+      clBinary = mf->GetDefinition("CMAKE_C_COMPILER") ?
+                 mf->GetSafeDefinition("CMAKE_C_COMPILER") :
+                 mf->GetSafeDefinition("CMAKE_CXX_COMPILER");
+      if (!clBinary.empty() && !clShowPrefix.empty())
         {
         useClDeps = true;
-        std::string qu = "\"";
-        clDepsBinary = qu + depsPtr + qu;
-        clShowPrefix = qu + showPtr + qu;
+        const std::string quote = " \"";
+        clBinary     = quote + clBinary     + "\" ";
+        clDepsBinary = quote + clDepsBinary + "\" ";
+        clShowPrefix = quote + clShowPrefix + "\" ";
         vars.DependencyFile = "$DEP_FILE";
         }
       }
@@ -395,17 +395,14 @@ cmNinjaTargetGenerator
        i != compileCmds.end(); ++i)
     this->GetLocalGenerator()->ExpandRuleVariables(*i, vars);
 
-  std::string cmdLine =
-    this->GetLocalGenerator()->BuildCommandLine(compileCmds);
-
+  std::string cmdLine;
   if(useClDeps)
     {
-    std::string cl = mf->GetDefinition("CMAKE_C_COMPILER");
-    if (cl.empty())
-      cl = mf->GetDefinition("CMAKE_CXX_COMPILER");
-    cmdLine =   clDepsBinary + " "   + lang + " $in \"$DEP_FILE\" $out "
-              + clShowPrefix + " \"" + cl   + "\" " + cmdLine;
+    cmdLine = clDepsBinary + lang + " $in \"$DEP_FILE\" $out " +
+              clShowPrefix + clBinary;
     }
+  cmdLine += this->GetLocalGenerator()->BuildCommandLine(compileCmds);
+
 
   // Write the rule for compiling file of the given language.
   cmOStringStream comment;