Merge topic 'KateHandleSpacesInPath'

22e5c6c2 Kate: handle spaces in build dir

Source/CTest/cmCTestReadCustomFilesCommand.cxx

@@ -10,7 +10,6 @@
   See the License for more information.
 ============================================================================*/
 #include "cmCTestReadCustomFilesCommand.h"
-
 #include "cmCTest.h"
 
 bool cmCTestReadCustomFilesCommand

Source/cmExtraKateGenerator.cxx

@@ -98,12 +98,12 @@ cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
   "\t\t\"clean_target\": \"clean\",\n";
 
   // build, clean and quick are for the build plugin kate <= 4.12:
-  fout << "\t\t\"build\": \"" << make << " -C " << homeOutputDir
-       << " " << makeArgs << " " << "all\",\n";
-  fout << "\t\t\"clean\": \"" << make << " -C " << homeOutputDir
-       << " " << makeArgs << " " << "clean\",\n";
-  fout << "\t\t\"quick\": \"" << make << " -C " << homeOutputDir
-       << " " << makeArgs << " " << "install\",\n";
+  fout << "\t\t\"build\": \"" << make << " -C \\\"" << homeOutputDir
+       << "\\\" " << makeArgs << " " << "all\",\n";
+  fout << "\t\t\"clean\": \"" << make << " -C \\\"" << homeOutputDir
+       << "\\\" " << makeArgs << " " << "clean\",\n";
+  fout << "\t\t\"quick\": \"" << make << " -C \\\"" << homeOutputDir
+       << "\\\" " << makeArgs << " " << "install\",\n";
 
   // this is for kate >= 4.13:
   fout <<
@@ -225,9 +225,9 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& fout,
   fout <<
     "\t\t\t" << JsonSep << "{\"name\":\"" << target << "\", "
     "\"build_cmd\":\"" << make
-                   << " -C " << (this->UseNinja ? homeOutputDir : path.c_str())
-                   << " " << makeArgs << " "
-                   << target << "\"}\n";
+               << " -C \\\"" << (this->UseNinja ? homeOutputDir : path.c_str())
+               << "\\\" " << makeArgs << " "
+               << target << "\"}\n";
 
   JsonSep = ',';
 }