[Cmake-commits] CMake branch, next, updated. v2.8.6-2284-gbf5421d

[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  bf5421d785dfc1e55623fd37f35166c6d1c7d6e4 (commit)
       via  ea6883752b7ad65a91af71611955ccb7b7055d76 (commit)
      from  3ed3ace254754f60d9f0b483dacc4dd0e346f6b2 (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=bf5421d785dfc1e55623fd37f35166c6d1c7d6e4
commit bf5421d785dfc1e55623fd37f35166c6d1c7d6e4
Merge: 3ed3ace ea68837
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Dec 19 15:15:56 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 19 15:15:56 2011 -0500

    Merge topic 'AddIncludePathForASMToDirectoryInformationFile' into next
    
    ea68837 fix #12262: dependency scanning for ASM files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea6883752b7ad65a91af71611955ccb7b7055d76
commit ea6883752b7ad65a91af71611955ccb7b7055d76
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Dec 18 19:15:34 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Dec 18 19:15:34 2011 +0100

    fix #12262: dependency scanning for ASM files
    
    Now also CMAKE_ASM_INCLUDE_PATH is written into
    CMakeDirectoryInformation.cmake, which is necessary to make
    the dependency scanning for included files work.
    
    Alex

diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 4e4f1d9..6be3eb9 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -470,6 +470,8 @@ void cmLocalUnixMakefileGenerator3::WriteDirectoryInformationFile()
     << "SET(CMAKE_CXX_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})\n";
   infoFileStream
     << "SET(CMAKE_Fortran_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})\n";
+  infoFileStream
+    << "SET(CMAKE_ASM_INCLUDE_PATH ${CMAKE_C_INCLUDE_PATH})\n";
 
   // Store the include regular expressions for this directory.
   infoFileStream

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

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


hooks/post-receive
-- 
CMake