[gentoo-commits] gentoo-x86 commit in dev-util/cmake/files: cmake-2.8.6-CodeBlocks.patch

[Andreas HAttel (dilfridge)]

dilfridge    11/10/30 23:09:30

  Added:                cmake-2.8.6-CodeBlocks.patch
  Log:
  Add upstream fix for QtCreator and CodeBlocks support, bug 388695
  
  (Portage version: 2.1.10.31/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.6-CodeBlocks.patch?rev=1.1&content-type=text/plain

Index: cmake-2.8.6-CodeBlocks.patch
===================================================================
From 240d39a6a4f72fe0e45fc1a1403e0b578d36a142 Mon Sep 17 00:00:00 2001
From: Clinton Stimpson <clinton@××××××××.com>
Date: Wed, 5 Oct 2011 10:02:32 -0600
Subject: [PATCH] Fix XML safety issue with adding preprocessor defines in CodeBlocks project.

---
 Source/cmExtraCodeBlocksGenerator.cxx |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Source/cmExtraCodeBlocksGenerator.cxx b/Source/cmExtraCodeBlocksGenerator.cxx
index 7db91c7..9a0b1ea 100644
--- a/Source/cmExtraCodeBlocksGenerator.cxx
+++ b/Source/cmExtraCodeBlocksGenerator.cxx
@@ -19,6 +19,7 @@
 #include "cmGeneratedFileStream.h"
 #include "cmTarget.h"
 #include "cmSystemTools.h"
+#include "cmXMLSafe.h"
 
 #include <cmsys/SystemTools.hxx>
 
@@ -585,7 +586,8 @@ void cmExtraCodeBlocksGenerator::AppendTarget(cmGeneratedFileStream& fout,
       for(std::vector<std::string>::const_iterator di = defs.begin();
           di != defs.end(); ++di)
         {
-        fout <<"            <Add option=\"-D" << di->c_str() << "\" />\n";
+        cmXMLSafe safedef(di->c_str());
+        fout <<"            <Add option=\"-D" << safedef.str() << "\" />\n";
         }
       }
 
-- 
1.7.0