diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-09 19:06:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-01-09 19:06:08 (GMT) |
| commit | 6d004976deeac00eb8ab3b26f407934110224352 (patch) | |
| tree | 2d87430e1d04a488105be7255b2fcac5b46a42ac | |
| parent | 67fd61b0615221b76437a6f6fe07fa51876c45b3 (diff) | |
| parent | c1311077b82e1ac4599101467162cdb45be217ec (diff) | |
| download | CMake-6d004976deeac00eb8ab3b26f407934110224352.zip CMake-6d004976deeac00eb8ab3b26f407934110224352.tar.gz CMake-6d004976deeac00eb8ab3b26f407934110224352.tar.bz2 | |
Merge branch 'vs10-include-backslashes' into release
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index a26b291..6376376 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1420,7 +1420,9 @@ OutputIncludes(std::vector<std::string> const & includes) for(std::vector<std::string>::const_iterator i = includes.begin(); i != includes.end(); ++i) { - *this->BuildFileStream << cmVS10EscapeXML(*i) << ";"; + std::string incDir = *i; + this->ConvertToWindowsSlash(incDir); + *this->BuildFileStream << cmVS10EscapeXML(incDir) << ";"; } this->WriteString("%(AdditionalIncludeDirectories)" "</AdditionalIncludeDirectories>\n", 0); |