[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7735-g07b9b62

[Alexander Neundorf]

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  07b9b62e8bcb56b3c7b348ac912d433bb898e482 (commit)
       via  c98b69bdf9778204bd0e19e057ca6959bf8d9d15 (commit)
       via  0c958c44af5020069efe41b2adf22115b75e8de1 (commit)
       via  66bf178346e3f00f74a3d64eb00db48cedb0ffb6 (commit)
      from  d02e54f13f998c0e7a6f7d6d44ec5e92d459e5b7 (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=07b9b62e8bcb56b3c7b348ac912d433bb898e482
commit 07b9b62e8bcb56b3c7b348ac912d433bb898e482
Merge: d02e54f c98b69b
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Feb 16 05:36:57 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 16 05:36:57 2014 -0500

    Merge topic 'KateHandleSpacesInPath' into next
    
    c98b69bd Kate: handle spaces in build dir
    0c958c44 CMake Nightly Date Stamp
    66bf1783 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c98b69bdf9778204bd0e19e057ca6959bf8d9d15
commit c98b69bdf9778204bd0e19e057ca6959bf8d9d15
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Feb 16 11:35:30 2014 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Feb 16 11:35:30 2014 +0100

    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/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index d0f83b2..bb9c04e 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,8 +225,8 @@ cmExtraKateGenerator::AppendTarget(cmGeneratedFileStream& fout,
   fout <<
     "\t\t\t" << JsonSep << "{\"name\":\"" << target << "\", "
     "\"build_cmd\":\"" << make
-                   << " -C " << (this->UseNinja ? homeOutputDir : path.c_str())
-                   << " " << makeArgs << " "
+                   << " -C \\\"" << (this->UseNinja ? homeOutputDir : path.c_str())
+                   << "\\\" " << makeArgs << " "
                    << target << "\"}\n";
 
   JsonSep = ',';

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

Summary of changes:
 Source/CMakeVersion.cmake       |    2 +-
 Source/cmExtraKateGenerator.cxx |   16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake