[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7747-ge239bf5

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e239bf59420019a6bb183696025d31671721dfa5 (commit)
       via  22e5c6c26b5baed0d9e0f398ea61667e7597d604 (commit)
      from  afecbdd24214d648053074e9dea504246e23ddb3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e239bf59420019a6bb183696025d31671721dfa5
commit e239bf59420019a6bb183696025d31671721dfa5
Merge: afecbdd 22e5c6c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 17 09:59:38 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 17 09:59:38 2014 -0500

    Merge topic 'KateHandleSpacesInPath' into next
    
    22e5c6c2 Kate: handle spaces in build dir


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22e5c6c26b5baed0d9e0f398ea61667e7597d604
commit 22e5c6c26b5baed0d9e0f398ea61667e7597d604
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Feb 16 11:35:30 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 17 09:54:03 2014 -0500

    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

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

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake