[Cmake-commits] CMake branch, next, updated. v2.8.6-1516-g1113dbe

[Alexander Neundorf]

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  1113dbe527ba46f1a6f54c3d1cfd0bf1a06c4640 (commit)
       via  e36a1be46694796277b68e61d7312475babb4e0c (commit)
      from  1d53d38d503513d39eb5003abbedb1ce82e6fe7c (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=1113dbe527ba46f1a6f54c3d1cfd0bf1a06c4640
commit 1113dbe527ba46f1a6f54c3d1cfd0bf1a06c4640
Merge: 1d53d38 e36a1be
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Oct 5 15:55:14 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 5 15:55:14 2011 -0400

    Merge topic 'DependencyScanningForASM' into next
    
    e36a1be fix #12262: use the C dependency scanner also for ASM files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e36a1be46694796277b68e61d7312475babb4e0c
commit e36a1be46694796277b68e61d7312475babb4e0c
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Oct 5 21:51:35 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Oct 5 21:51:35 2011 +0200

    fix #12262: use the C dependency scanner also for ASM files
    
    Files for the ASM language are those assembler files which are processed
    by the C/CXX compiler, and they may contain preprocessor directives, so
    run the C dependency scanner also on them.
    
    Alex

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 2eae9d0..da6a1c6 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1559,7 +1559,7 @@ cmLocalUnixMakefileGenerator3
 
     // Create the scanner for this language
     cmDepends *scanner = 0;
-    if(lang == "C" || lang == "CXX" || lang == "RC")
+    if(lang == "C" || lang == "CXX" || lang == "RC" || lang == "ASM")
       {
       // TODO: Handle RC (resource files) dependencies correctly.
       scanner = new cmDependsC(this, targetDir, lang.c_str(), &validDeps);

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

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


hooks/post-receive
-- 
CMake