summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-02-08 15:32:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-02-08 15:32:59 (GMT)
commitc1ee5166adcbe0aeb25b6cd368bd2917a70b22b4 (patch)
tree5bdcbd4d060b986a91a363adc437749144999bd4 /Modules
parent5643088bb18cebcfa9ba28b16cf7ae198ae31645 (diff)
parent81ecc7263754ad96e3aa77ec4d60b72c49cc1409 (diff)
downloadCMake-c1ee5166adcbe0aeb25b6cd368bd2917a70b22b4.zip
CMake-c1ee5166adcbe0aeb25b6cd368bd2917a70b22b4.tar.gz
CMake-c1ee5166adcbe0aeb25b6cd368bd2917a70b22b4.tar.bz2
Merge topic 'FindCUDA.cmake/FixNonExistantDependencyFile'
81ecc726 FindCUDA: Added some additional comments about non-existent dependency files. 4b561b4c FindCUDA: Fix for when a non-existent dependency file is found.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindCUDA/make2cmake.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindCUDA/make2cmake.cmake b/Modules/FindCUDA/make2cmake.cmake
index c433fa8..b841f3b 100644
--- a/Modules/FindCUDA/make2cmake.cmake
+++ b/Modules/FindCUDA/make2cmake.cmake
@@ -67,7 +67,9 @@ if (NOT "${depend_text}" STREQUAL "")
endif()
endif()
- if(NOT IS_DIRECTORY "${file}")
+ # 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
# just /include.