diff options
| author | Brad King <brad.king@kitware.com> | 2014-01-08 13:50:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-01-08 13:58:20 (GMT) |
| commit | c1311077b82e1ac4599101467162cdb45be217ec (patch) | |
| tree | dfde426793cab60eba83b66b5f8669a44a84fa61 | |
| parent | c515dc574879448d66e2c5a27b9807d95a27fefd (diff) | |
| download | CMake-c1311077b82e1ac4599101467162cdb45be217ec.zip CMake-c1311077b82e1ac4599101467162cdb45be217ec.tar.gz CMake-c1311077b82e1ac4599101467162cdb45be217ec.tar.bz2 | |
VS: Convert include path to backslashes for VS >= 10
In VS <= 9 we already convert include paths to use backslashes
but the conversion was left out of the VS >= 10 generator.
Add the conversion now for consistency. VS 11 and 12 now require
it because they mistakenly interpret forward-slash options that
happen to occur in paths:
http://connect.microsoft.com/VisualStudio/feedback/details/778367
| -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); |