Ninja: allow spaces in source path

And make /showIncude prefix visible for all build rules

2 files changed, 11 insertions, 30 deletions

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 9a2597b..648855c 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -458,8 +458,7 @@ void cmGlobalNinjaGenerator
     else if(*l == "RC")
       {
       // check if mingw is used
-      const char* cc = mf->GetDefinition("CMAKE_C_COMPILER");
-      if(cc && std::string(cc).find("gcc.exe") != std::string::npos)
+      if(mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
         {
         UsingMinGW = true;
         std::string rc = cmSystemTools::FindProgram("windres");
@@ -467,17 +466,6 @@ void cmGlobalNinjaGenerator
           rc = "windres.exe";;
         mf->AddDefinition("CMAKE_RC_COMPILER", rc.c_str());
         }
-      else if (cc && std::string(cc).find("cl.exe") != std::string::npos)
-        {
-        const char* cmake = mf->GetDefinition("CMAKE_COMMAND");
-        std::string bindir = cmake ? cmake : "";
-        cmSystemTools::ReplaceString(bindir, "cmake.exe", "");
-        std::vector<std::string> locations;
-        locations.push_back(bindir);
-        std::string cldeps = cmSystemTools::FindProgram("cmcldeps", locations);
-        if(!cldeps.empty())
-          mf->AddDefinition("CMAKE_CMCLDEPS_EXECUTABLE", cldeps.c_str());
-        }
       }
     this->cmGlobalGenerator::EnableLanguage(language, mf, optional);
     this->ResolveLanguageCompiler(*l, mf, optional);
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 6518727..75b3929 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -330,20 +330,14 @@ cmNinjaTargetGenerator
   vars.Defines = "$DEFINES";
   vars.TargetPDB = "$TARGET_PDB";
 
-  const char* cldeps = 0;
-  const char* showIncludePrefix = 0;
-  const char* cc = this->GetMakefile()->GetDefinition("CMAKE_C_COMPILER");
-  if(cc && std::string(cc).find("cl.exe") != std::string::npos)
-    {
-    cldeps = this->GetMakefile()->GetDefinition("CMAKE_CMCLDEPS_EXECUTABLE");
-    showIncludePrefix = this->GetMakefile()->GetDefinition("CMAKE_CL_SHOWINCLUDE_PREFIX");
-    }
+  cmMakefile* mf = this->GetMakefile();
+  const char* clDepsBinary = mf->GetDefinition("CMAKE_CMCLDEPS_EXECUTABLE");
+  const char* clShowPrefix = mf->GetDefinition("CMAKE_CL_SHOWINCLUDE_PREFIX");
 
   std::string depfile;
   std::string depfileFlagsName = "CMAKE_DEPFILE_FLAGS_" + language;
-  const char *depfileFlags =
-    this->GetMakefile()->GetDefinition(depfileFlagsName.c_str());
-  if (depfileFlags || (cldeps && showIncludePrefix)) {
+  const char *depfileFlags = mf->GetDefinition(depfileFlagsName.c_str());
+  if (depfileFlags || (clDepsBinary && clShowPrefix)) {
     std::string depfileFlagsStr = depfileFlags ? depfileFlags : "";
     depfile = "$out.d";
     cmSystemTools::ReplaceString(depfileFlagsStr, "<DEPFILE>",
@@ -351,7 +345,7 @@ cmNinjaTargetGenerator
     cmSystemTools::ReplaceString(depfileFlagsStr, "<OBJECT>",
                                  "$out");
     cmSystemTools::ReplaceString(depfileFlagsStr, "<CMAKE_C_COMPILER>",
-                       this->GetMakefile()->GetDefinition("CMAKE_C_COMPILER"));
+                       mf->GetDefinition("CMAKE_C_COMPILER"));
     flags += " " + depfileFlagsStr;
   }
   vars.Flags = flags.c_str();
@@ -361,8 +355,7 @@ cmNinjaTargetGenerator
   std::string compileCmdVar = "CMAKE_";
   compileCmdVar += language;
   compileCmdVar += "_COMPILE_OBJECT";
-  std::string compileCmd =
-    this->GetMakefile()->GetRequiredDefinition(compileCmdVar.c_str());
+  std::string compileCmd = mf->GetRequiredDefinition(compileCmdVar.c_str());
   std::vector<std::string> compileCmds;
   cmSystemTools::ExpandListArgument(compileCmd, compileCmds);
 
@@ -373,10 +366,10 @@ cmNinjaTargetGenerator
   std::string cmdLine =
     this->GetLocalGenerator()->BuildCommandLine(compileCmds);
 
-  if(cldeps && showIncludePrefix)
+  if(clDepsBinary && clShowPrefix)
     {
-    std::string prefix = showIncludePrefix;
-    cmdLine =  std::string(cldeps) + " $in $out.d $out " + "\"" + prefix + "\" " + cmdLine;
+    std::string prefix = clShowPrefix;
+    cmdLine = "\"" + std::string(clDepsBinary) + "\" $in $out.d $out \"" + prefix + "\" " + cmdLine;
     }
 
   // Write the rule for compiling file of the given language.