[Cmake-commits] CMake branch, next, updated. v2.8.6-2127-g9150657

[James Bigler]

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  9150657a9684191df98f222c829dcc5ca45ad305 (commit)
       via  aa595440786dcd84cbca81410c76c0b170b3abac (commit)
      from  fc522a07d7c8b33d1c73a160657f8f8498819a7f (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=9150657a9684191df98f222c829dcc5ca45ad305
commit 9150657a9684191df98f222c829dcc5ca45ad305
Merge: fc522a0 aa59544
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Dec 5 18:30:42 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 5 18:30:42 2011 -0500

    Merge topic 'topics/FindCUDA/linux-double-build' into next
    
    aa59544 Reset dependency file list when a dependency disappeared.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aa595440786dcd84cbca81410c76c0b170b3abac
commit aa595440786dcd84cbca81410c76c0b170b3abac
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Dec 5 16:29:28 2011 -0700
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Mon Dec 5 16:29:28 2011 -0700

    Reset dependency file list when a dependency disappeared.
    
    Fix a long outstanding bug when a file in the dependency list wasn't found.  This bug
    wouldn't reset the dependencies, so the makefile would still want the missing file when
    building.  The work around was to configure twice, but this is no longer necessary.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index d5ef430..f696f2e 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -339,6 +339,8 @@ macro(CUDA_INCLUDE_NVCC_DEPENDENCIES dependency_file)
   # output depend on the dependency file itself, which should cause the
   # rule to re-run.
   if(CUDA_NVCC_DEPEND_REGENERATE)
+    set(CUDA_NVCC_DEPEND ${dependency_file})
+    #message("Generating an empty dependency_file: ${dependency_file}")
     file(WRITE ${dependency_file} "#FindCUDA.cmake generated file.  Do not edit.\n")
   endif(CUDA_NVCC_DEPEND_REGENERATE)
 

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

Summary of changes:
 Modules/FindCUDA.cmake |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake