kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kate: handle spaces in build dir 

They need to be escaped in the json file... I'm quite
sure I tested this before, obviously I didn't test it
correctly.

Alex
This commit is contained in:
Alex Neundorf 2014-02-16 11:35:30 +01:00 committed by Brad King
parent 0c958c44af
commit 22e5c6c26b
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/CTest/cmCTestReadCustomFilesCommand.cxx
View File

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

18
Source/cmExtraKateGenerator.cxx
View File

@ -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 = ',';
}