[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3580-gc690998

[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  c690998f2233ad24d7ee3aa447bf6a46813494de (commit)
       via  e7bcdf856e13a17aacff7218dca99363cc38d007 (commit)
      from  7ef7569806e6b0a81ed742c0123dff58954d77f6 (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=c690998f2233ad24d7ee3aa447bf6a46813494de
commit c690998f2233ad24d7ee3aa447bf6a46813494de
Merge: 7ef7569 e7bcdf8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 1 15:25:12 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 1 15:25:12 2013 -0400

    Merge topic 'vs10-include-dir-ampersand' into next
    
    e7bcdf8 VS10: Escape include paths in XML project files (#14331)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7bcdf856e13a17aacff7218dca99363cc38d007
commit e7bcdf856e13a17aacff7218dca99363cc38d007
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 1 14:58:54 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 1 15:00:28 2013 -0400

    VS10: Escape include paths in XML project files (#14331)
    
    Fix generation of the AdditionalIncludeDirectories element content to
    escape for XML syntax.  We already escape content of other elements,
    this one was simply missing by accident.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 1130704..937509e 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1389,7 +1389,7 @@ OutputIncludes(std::vector<std::string> const & includes)
   for(std::vector<std::string>::const_iterator i =  includes.begin();
       i != includes.end(); ++i)
     {
-    *this->BuildFileStream << *i << ";";
+    *this->BuildFileStream << cmVS10EscapeXML(*i) << ";";
     }
   this->WriteString("%(AdditionalIncludeDirectories)"
                     "</AdditionalIncludeDirectories>\n", 0);

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake