summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-08-02 12:18:38 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-08-02 12:18:38 (GMT)
commit1e0539cd2c14e2cb892e5f95238002d981645b78 (patch)
tree46e9aad01fc088423b935a84018e990866b2e9d4
parent3ec8136baeb735c9e3123c6fd561ddacd7843721 (diff)
parente7bcdf856e13a17aacff7218dca99363cc38d007 (diff)
downloadCMake-1e0539cd2c14e2cb892e5f95238002d981645b78.zip
CMake-1e0539cd2c14e2cb892e5f95238002d981645b78.tar.gz
CMake-1e0539cd2c14e2cb892e5f95238002d981645b78.tar.bz2
Merge topic 'vs10-include-dir-ampersand'
e7bcdf8 VS10: Escape include paths in XML project files (#14331)
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
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);