[Cmake-commits] CMake branch, next, updated. v2.8.3-1393-g3961ca3

[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  3961ca376a888f8c37b512b87e154cbe63d1ce78 (commit)
       via  8dc7501d509738606e1d00d23e00a4d28a17e832 (commit)
      from  5d36ab17c7604bc8936ec00b22c3ddd081b0d8d4 (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=3961ca376a888f8c37b512b87e154cbe63d1ce78
commit 3961ca376a888f8c37b512b87e154cbe63d1ce78
Merge: 5d36ab1 8dc7501
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 15:15:26 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 17 15:15:26 2011 -0500

    Merge topic 'depend-scan-backslash-issue-10281' into next
    
    8dc7501 Normalize slashes in scanned #include lines (#10281)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dc7501d509738606e1d00d23e00a4d28a17e832
commit 8dc7501d509738606e1d00d23e00a4d28a17e832
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 17 15:03:53 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 17 15:03:53 2011 -0500

    Normalize slashes in scanned #include lines (#10281)
    
    On Windows platforms source files may contain '\' in include directives:
    
      #include "a\b.h"
    
    Normalize these while scanning to use forward slashes.  CMake will
    convert from forward slashes to the direction preferred by the native
    build tools when writing the path to 'depend.make' files.

diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index 942cb3f..a76b3af 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -448,6 +448,7 @@ void cmDependsC::Scan(std::istream& is, const char* directory,
       // Get the file being included.
       UnscannedEntry entry;
       entry.FileName = this->IncludeRegexLine.match(2);
+      cmSystemTools::ConvertToUnixSlashes(entry.FileName);
       if(this->IncludeRegexLine.match(3) == "\"" &&
          !cmSystemTools::FileIsFullPath(entry.FileName.c_str()))
         {

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

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


hooks/post-receive
-- 
CMake