[Cmake-commits] CMake branch, next, updated. v2.8.6-1514-g1d53d38

[Clinton Stimpson]

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  1d53d38d503513d39eb5003abbedb1ce82e6fe7c (commit)
       via  240d39a6a4f72fe0e45fc1a1403e0b578d36a142 (commit)
      from  ef78b3971ef2d0502f4bd9a6083a9ca3883ff25c (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=1d53d38d503513d39eb5003abbedb1ce82e6fe7c
commit 1d53d38d503513d39eb5003abbedb1ce82e6fe7c
Merge: ef78b39 240d39a
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Oct 5 12:03:38 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 12:03:38 2011 -0400

    Merge topic 'CodeBlocks-quoting' into next
    
    240d39a Fix XML safety issue with adding preprocessor defines in CodeBlocks project.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=240d39a6a4f72fe0e45fc1a1403e0b578d36a142
commit 240d39a6a4f72fe0e45fc1a1403e0b578d36a142
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Oct 5 10:02:32 2011 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Oct 5 10:02:32 2011 -0600

    Fix XML safety issue with adding preprocessor defines in CodeBlocks project.

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";
         }
       }
 

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

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


hooks/post-receive
-- 
CMake