summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorJames Bigler <jamesbigler@gmail.com>2010-10-04 22:11:08 (GMT)
committerJames Bigler <jamesbigler@gmail.com>2010-10-04 22:11:08 (GMT)
commit1df8516c0eb88d01389c8601be97e3616b8b42dd (patch)
tree909472fc6242d9443f39495f000880037cbe1971 /Modules
parent5eca3dd0f0289a84c30c98887c053d4dad54b8a5 (diff)
downloadCMake-1df8516c0eb88d01389c8601be97e3616b8b42dd.zip
CMake-1df8516c0eb88d01389c8601be97e3616b8b42dd.tar.gz
CMake-1df8516c0eb88d01389c8601be97e3616b8b42dd.tar.bz2
Fix for bug 0011263.
Added CUSDKCOMPUTE_ROOT to the list of paths when looking for CUDA_SDK_ROOT_DIR.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindCUDA.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index dad5709..0718aef 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -612,8 +612,10 @@ else()
endif()
########################
-# Look for the SDK stuff
+# Look for the SDK stuff. As of CUDA 3.0 NVSDKCUDA_ROOT has been replaced with
+# NVSDKCOMPUTE_ROOT with the old CUDA C contents moved into the C subdirectory
find_path(CUDA_SDK_ROOT_DIR common/inc/cutil.h
+ "$ENV{NVSDKCOMPUTE_ROOT}/C"
"$ENV{NVSDKCUDA_ROOT}"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\NVIDIA Corporation\\Installed Products\\NVIDIA SDK 10\\Compute;InstallDir]"
"/Developer/GPU\ Computing/C"