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

Merge topic 'KateHandleSpacesInPath'

Browse Source 
22e5c6c2 Kate: handle spaces in build dir
This commit is contained in:
Brad King 2014-02-17 09:59:45 -05:00 committed by CMake Topic Stage
commit 65c74eb98f
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. See the License for more information.
============================================================================*/ ============================================================================*/
#include "cmCTestReadCustomFilesCommand.h" #include "cmCTestReadCustomFilesCommand.h"
#include "cmCTest.h" #include "cmCTest.h"
bool cmCTestReadCustomFilesCommand bool cmCTestReadCustomFilesCommand

18
Source/cmExtraKateGenerator.cxx
View File

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