[Cmake-commits] CMake branch, next, updated. v2.8.6-2300-gff560f2

[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  ff560f201e709791b7078947013e3254fc88af13 (commit)
       via  154f53738f05ebbb22a369e852453beaaf981cb7 (commit)
      from  b99d72a544b4200799da334e888d881c62b0f577 (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=ff560f201e709791b7078947013e3254fc88af13
commit ff560f201e709791b7078947013e3254fc88af13
Merge: b99d72a 154f537
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Tue Dec 20 16:22:28 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 20 16:22:28 2011 -0500

    Merge topic 'topics/FindCUDA/Find-new-libraries-upto-4.1' into next
    
    154f537 Added support for curand, cusparse, npp, nvcuenc and nvcuvid libraries.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=154f53738f05ebbb22a369e852453beaaf981cb7
commit 154f53738f05ebbb22a369e852453beaaf981cb7
Author:     James Bigler <jamesbigler at gmail.com>
AuthorDate: Tue Dec 20 14:20:04 2011 -0700
Commit:     James Bigler <jamesbigler at gmail.com>
CommitDate: Tue Dec 20 14:20:04 2011 -0700

    Added support for curand, cusparse, npp, nvcuenc and nvcuvid libraries.
    
    This addresses Bug 11882 which provided a sample implementation for adding
    support for cusparse.  I went ahead and added all the libraries I thought
    appropriate.

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 18f7442..4d91a92 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -216,6 +216,18 @@
 #  CUDA_CUBLAS_LIBRARIES -- Device or emulation library for the Cuda BLAS
 #                           implementation (alterative to:
 #                           CUDA_ADD_CUBLAS_TO_TARGET macro).
+#  CUDA_curand_LIBRARY   -- CUDA Random Number Generation library.
+#                           Only available for CUDA version 3.2+.
+#  CUDA_cusparse_LIBRARY -- CUDA Sparse Matrix library.
+#                           Only available for CUDA version 3.2+.
+#  CUDA_npp_LIBRARY      -- NVIDIA Performance Primitives library.
+#                           Only available for CUDA version 4.0+.
+#  CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library.
+#                           Only available for CUDA version 3.2+.
+#                           Windows only.
+#  CUDA_nvcuvid_LIBRARY  -- CUDA Video Decoder library.
+#                           Only available for CUDA version 3.2+.
+#                           Windows only.
 #
 #
 #  James Bigler, NVIDIA Corp (nvidia.com - jbigler)
@@ -430,6 +442,11 @@ if(NOT "${CUDA_TOOLKIT_ROOT_DIR}" STREQUAL "${CUDA_TOOLKIT_ROOT_DIR_INTERNAL}")
   unset(CUDA_cublasemu_LIBRARY CACHE)
   unset(CUDA_cufft_LIBRARY CACHE)
   unset(CUDA_cufftemu_LIBRARY CACHE)
+  unset(CUDA_curand_LIBRARY CACHE)
+  unset(CUDA_cusparse_LIBRARY CACHE)
+  unset(CUDA_npp_LIBRARY CACHE)
+  unset(CUDA_nvcuvenc_LIBRARY CACHE)
+  unset(CUDA_nvcuvid_LIBRARY CACHE)
 endif()
 
 if(NOT "${CUDA_SDK_ROOT_DIR}" STREQUAL "${CUDA_SDK_ROOT_DIR_INTERNAL}")
@@ -600,7 +617,7 @@ if(CUDA_VERSION VERSION_GREATER "3.0")
   endif()
 endif()
 
-# Search for cufft and cublas libraries.
+# Search for additional CUDA toolkit libraries.
 if(CUDA_VERSION VERSION_LESS "3.1")
   # Emulation libraries aren't available in version 3.1 onward.
   find_cuda_helper_libs(cufftemu)
@@ -608,6 +625,18 @@ if(CUDA_VERSION VERSION_LESS "3.1")
 endif()
 find_cuda_helper_libs(cufft)
 find_cuda_helper_libs(cublas)
+if(NOT CUDA_VERSION VERSION_LESS "3.2")
+  # cusparse showed up in version 3.2
+  find_cuda_helper_libs(cusparse)
+  find_cuda_helper_libs(curand)
+  if (WIN32)
+    find_cuda_helper_libs(nvcuvenc)
+    find_cuda_helper_libs(nvcuvid)
+  endif()
+endif()
+if(NOT CUDA_VERSION VERSION_LESS "4.0")
+  find_cuda_helper_libs(npp)
+endif()
 
 if (CUDA_BUILD_EMULATION)
   set(CUDA_CUFFT_LIBRARIES ${CUDA_cufftemu_LIBRARY})

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

Summary of changes:
 Modules/FindCUDA.cmake |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake