diff options
| author | Brad King <brad.king@kitware.com> | 2014-02-17 14:59:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-02-17 14:59:45 (GMT) |
| commit | 65c74eb98f3447fbfcc7d034401b768cdc2ed09d (patch) | |
| tree | 5991413ba3ee775901965cebfab1a11b8b31ca9e /Source | |
| parent | a3bac644f196c208e919bb2d32d01b75f4fc8d9b (diff) | |
| parent | 22e5c6c26b5baed0d9e0f398ea61667e7597d604 (diff) | |
| download | CMake-65c74eb98f3447fbfcc7d034401b768cdc2ed09d.zip CMake-65c74eb98f3447fbfcc7d034401b768cdc2ed09d.tar.gz CMake-65c74eb98f3447fbfcc7d034401b768cdc2ed09d.tar.bz2 | |
Merge topic 'KateHandleSpacesInPath'
22e5c6c2 Kate: handle spaces in build dir
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestReadCustomFilesCommand.cxx | 1 | ||||
| -rw-r--r-- | Source/cmExtraKateGenerator.cxx | 18 |
2 files changed, 9 insertions, 10 deletions
diff --git a/Source/CTest/cmCTestReadCustomFilesCommand.cxx b/Source/CTest/cmCTestReadCustomFilesCommand.cxx index 5db01f9..3b9d552 100644 --- a/Source/CTest/cmCTestReadCustomFilesCommand.cxx +++ b/Source/CTest/cmCTestReadCustomFilesCommand.cxx @@ -10,7 +10,6 @@ See the License for more information. ============================================================================*/ #include "cmCTestReadCustomFilesCommand.h" - #include "cmCTest.h" bool cmCTestReadCustomFilesCommand diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index d0f83b2..a0d37d4 100644 --- a/Source/cmExtraKateGenerator.cxx +++ b/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 = ','; } |