[Cmake-commits] CMake branch, next, updated. v2.8.2-995-gc9bcf5a

[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  c9bcf5a065facaac96b8ee3ef1361be15848722f (commit)
       via  1df8516c0eb88d01389c8601be97e3616b8b42dd (commit)
       via  5eca3dd0f0289a84c30c98887c053d4dad54b8a5 (commit)
      from  9965fe715c471413b6a721203b9f99d7124830a5 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9bcf5a065facaac96b8ee3ef1361be15848722f
commit c9bcf5a065facaac96b8ee3ef1361be15848722f
Merge: 9965fe7 1df8516
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Oct 4 16:13:47 2010 -0600
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Mon Oct 4 16:13:47 2010 -0600

    Merge branch 'topics/Fix-0011263-CUDA_SDK_PATH' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1df8516c0eb88d01389c8601be97e3616b8b42dd
commit 1df8516c0eb88d01389c8601be97e3616b8b42dd
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Mon Oct 4 16:11:08 2010 -0600
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Mon Oct 4 16:11:08 2010 -0600

    Fix for bug 0011263.
    
    Added CUSDKCOMPUTE_ROOT to the list of paths when looking for CUDA_SDK_ROOT_DIR.

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"

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

Summary of changes:
 Modules/FindCUDA.cmake            |    4 +++-
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake