[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7086-gff744f3

[Nils Gladitz]

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  ff744f3cfccebb01b436f2a5f09d5df7bce3850c (commit)
       via  f2b47197dc91db01e5d21536a6d1d9e85f3c72b5 (commit)
      from  53c2032fc545f4c267615b761c4e007a34734fb3 (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=ff744f3cfccebb01b436f2a5f09d5df7bce3850c
commit ff744f3cfccebb01b436f2a5f09d5df7bce3850c
Merge: 53c2032 f2b4719
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jan 13 17:17:24 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 13 17:17:24 2014 -0500

    Merge topic 'fix-cb-nmake-quotes' into next
    
    f2b47197 CodeBlocks: fix unescaped command quotes when used with nmake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2b47197dc91db01e5d21536a6d1d9e85f3c72b5
commit f2b47197dc91db01e5d21536a6d1d9e85f3c72b5
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Jan 13 23:15:26 2014 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Jan 13 23:15:26 2014 +0100

    CodeBlocks: fix unescaped command quotes when used with nmake

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index a066153..548c88b 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -761,10 +761,12 @@ std::string cmExtraCodeBlocksGenerator::BuildMakeCommand(
   std::string command = make;
   if (strcmp(this->GlobalGenerator->GetName(), "NMake Makefiles")==0)
     {
+    // For Windows ConvertToOutputPath already adds quotes when required.
+    // These need to be escaped, see
+    // http://public.kitware.com/Bug/view.php?id=13952
     std::string makefileName = cmSystemTools::ConvertToOutputPath(makefile);
-    command += " /NOLOGO /f "";
-    command += makefileName;
-    command += "" ";
+    command += " /NOLOGO /f ";
+    command += cmXMLSafe(makefileName).str();
     command += " VERBOSE=1 ";
     command += target;
     }

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

Summary of changes:
 Source/cmExtraCodeBlocksGenerator.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake