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 b11b9d05dd1d9e77ac76f6b9b72c4f1face53418 (commit)
via 81ecc7263754ad96e3aa77ec4d60b72c49cc1409 (commit)
from 42416ba1798a81bd3d0e9aeb9919dc3e3de3c603 (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=b11b9d05dd1d9e77ac76f6b9b72c4f1face53418
commit b11b9d05dd1d9e77ac76f6b9b72c4f1face53418
Merge: 42416ba 81ecc72
Author: James Bigler <jamesbig...@gmail.com>
AuthorDate: Fri Feb 5 16:51:26 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 5 16:51:26 2016 -0500
Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile' into next
81ecc726 FindCUDA: Added some additional comments about non-existent
dependency files.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81ecc7263754ad96e3aa77ec4d60b72c49cc1409
commit 81ecc7263754ad96e3aa77ec4d60b72c49cc1409
Author: James Bigler <jamesbig...@gmail.com>
AuthorDate: Fri Feb 5 14:50:29 2016 -0700
Commit: James Bigler <jamesbig...@gmail.com>
CommitDate: Fri Feb 5 14:50:29 2016 -0700
FindCUDA: Added some additional comments about non-existent dependency
files.
diff --git a/Modules/FindCUDA/make2cmake.cmake
b/Modules/FindCUDA/make2cmake.cmake
index 7b3ca03..b841f3b 100644
--- a/Modules/FindCUDA/make2cmake.cmake
+++ b/Modules/FindCUDA/make2cmake.cmake
@@ -67,6 +67,8 @@ if (NOT "${depend_text}" STREQUAL "")
endif()
endif()
+ # Make sure we check to see if we have a file, before asking if it is not
a directory.
+ # if(NOT IS_DIRECTORY "") will return TRUE.
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
-----------------------------------------------------------------------
Summary of changes:
Modules/FindCUDA/make2cmake.cmake | 2 ++
1 file changed, 2 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
