summaryrefslogtreecommitdiffstats
path: root/Modules/FindCUDA.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2010-10-05 19:32:58 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2010-10-05 19:32:58 (GMT)
commit100f2ad2783de30e3d219a54df9eaa5b1a76c09f (patch)
treeaee712f49ab4b64677259faf67aab399a52f4121 /Modules/FindCUDA.cmake
parentf7c58fe5f3bd161f220dd721921ce6756df7e4e5 (diff)
parent1df8516c0eb88d01389c8601be97e3616b8b42dd (diff)
downloadCMake-100f2ad2783de30e3d219a54df9eaa5b1a76c09f.zip
CMake-100f2ad2783de30e3d219a54df9eaa5b1a76c09f.tar.gz
CMake-100f2ad2783de30e3d219a54df9eaa5b1a76c09f.tar.bz2
Merge topic 'Fix-0011263-CUDA_SDK_PATH'
1df8516 Fix for bug 0011263.
Diffstat (limited to 'Modules/FindCUDA.cmake')
-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"