[Cmake-commits] CMake branch, next, updated. v3.1.0-2289-g7f7c996

[Brad King]

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  7f7c996a707e206c8cd87bb97689b77ad249e114 (commit)
       via  e56c93279523701d8f044372fcc451ce50369b93 (commit)
      from  fcf07b5ac180c78f5d88d3aebad2120844a2e841 (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=7f7c996a707e206c8cd87bb97689b77ad249e114
commit 7f7c996a707e206c8cd87bb97689b77ad249e114
Merge: fcf07b5 e56c932
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 21 15:55:26 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 21 15:55:26 2015 -0500

    Merge topic 'FindCUDA-cusolver' into next
    
    e56c9327 FindCUDA: Add cuSOLVER library from CUDA 7.0


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e56c93279523701d8f044372fcc451ce50369b93
commit e56c93279523701d8f044372fcc451ce50369b93
Author:     Andrew Seidl <dev at aas.io>
AuthorDate: Tue Jan 20 18:06:11 2015 -0600
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jan 21 15:54:12 2015 -0500

    FindCUDA: Add cuSOLVER library from CUDA 7.0

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 4f1f09a..cae9214 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -276,6 +276,8 @@
 #                            Only available for CUDA version 4.0+.
 #   CUDA_curand_LIBRARY   -- CUDA Random Number Generation library.
 #                            Only available for CUDA version 3.2+.
+#   CUDA_cusolver_LIBRARY -- CUDA Direct Solver library.
+#                            Only available for CUDA version 7.0+.
 #   CUDA_cusparse_LIBRARY -- CUDA Sparse Matrix library.
 #                            Only available for CUDA version 3.2+.
 #   CUDA_npp_LIBRARY      -- NVIDIA Performance Primitives lib.
@@ -518,6 +520,7 @@ macro(cuda_unset_include_and_libraries)
   unset(CUDA_cufft_LIBRARY CACHE)
   unset(CUDA_cufftemu_LIBRARY CACHE)
   unset(CUDA_curand_LIBRARY CACHE)
+  unset(CUDA_cusolver_LIBRARY CACHE)
   unset(CUDA_cusparse_LIBRARY CACHE)
   unset(CUDA_npp_LIBRARY CACHE)
   unset(CUDA_nppc_LIBRARY CACHE)
@@ -754,6 +757,10 @@ if(CUDA_VERSION VERSION_GREATER "5.0")
 elseif(NOT CUDA_VERSION VERSION_LESS "4.0")
   find_cuda_helper_libs(npp)
 endif()
+if(NOT CUDA_VERSION VERSION_LESS "7.0")
+  # cusolver showed up in version 7.0
+  find_cuda_helper_libs(cusolver)
+endif()
 
 if (CUDA_BUILD_EMULATION)
   set(CUDA_CUFFT_LIBRARIES ${CUDA_cufftemu_LIBRARY})

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

Summary of changes:
 Modules/FindCUDA.cmake |    7 +++++++
 1 file changed, 7 insertions(+)


hooks/post-receive
-- 
CMake