[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6836-gb3f2a5c

[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  b3f2a5c394feb0c0b3bf2d4cf11d97c31e18c64a (commit)
       via  c1311077b82e1ac4599101467162cdb45be217ec (commit)
      from  2e29e1c717a47bddb419df54c754b22d6bfaaf6c (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=b3f2a5c394feb0c0b3bf2d4cf11d97c31e18c64a
commit b3f2a5c394feb0c0b3bf2d4cf11d97c31e18c64a
Merge: 2e29e1c c131107
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 8 08:59:19 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 8 08:59:19 2014 -0500

    Merge topic 'vs10-include-backslashes' into next
    
    c131107 VS: Convert include path to backslashes for VS >= 10


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1311077b82e1ac4599101467162cdb45be217ec
commit c1311077b82e1ac4599101467162cdb45be217ec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 8 08:50:46 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 8 08:58:20 2014 -0500

    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

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);

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

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


hooks/post-receive
-- 
CMake