[Cmake-commits] CMake branch, next, updated. v3.5.0-rc1-47-g42416ba

[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  42416ba1798a81bd3d0e9aeb9919dc3e3de3c603 (commit)
       via  4b561b4cb528a3d6fee6baa79dacfff31923a9b6 (commit)
      from  7885d80b0f36dc8a031d36277d3d8b35a1776a1b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42416ba1798a81bd3d0e9aeb9919dc3e3de3c603
commit 42416ba1798a81bd3d0e9aeb9919dc3e3de3c603
Merge: 7885d80 4b561b4
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Fri Feb 5 16:36:23 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 5 16:36:23 2016 -0500

    Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile' into next
    
    4b561b4c FindCUDA: Fix for when a non-existent dependency file is found.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4b561b4cb528a3d6fee6baa79dacfff31923a9b6
commit 4b561b4cb528a3d6fee6baa79dacfff31923a9b6
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Fri Feb 5 14:32:01 2016 -0700
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Fri Feb 5 14:32:01 2016 -0700

    FindCUDA: Fix for when a non-existent dependency file is found.
    
    Previously if a non-existent dependency file is found we set the file to "" and
    then do if(NOT IS_DIRECTORY "${file}").  Later we call get_filename_component
    on the empty file which returns basically the current build directory.
    
    Having a dependency on the current build directory is really annoying, because
    anything that compiles into that directory will change the file stamp and
    cause your files to rebuild every time you call make. :(

diff --git a/Modules/FindCUDA/make2cmake.cmake b/Modules/FindCUDA/make2cmake.cmake
index c433fa8..7b3ca03 100644
--- a/Modules/FindCUDA/make2cmake.cmake
+++ b/Modules/FindCUDA/make2cmake.cmake
@@ -67,7 +67,7 @@ if (NOT "${depend_text}" STREQUAL "")
       endif()
     endif()
 
-    if(NOT IS_DIRECTORY "${file}")
+    if(file AND NOT IS_DIRECTORY "${file}")
       # If softlinks start to matter, we should change this to REALPATH.  For now we need
       # to flatten paths, because nvcc can generate stuff like /bin/../include instead of
       # just /include.

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

Summary of changes:
 Modules/FindCUDA/make2cmake.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake