[Cmake-commits] CMake branch, next, updated. v3.5.2-1577-gcb027b4

[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  cb027b4aa9ffdcdd1fb148bb0157e54acd00dbbe (commit)
       via  81e73b7240e3b11b454f01f21bab85b4aa95d6af (commit)
      from  1d515e50baa2f096f85d3ba97a67592fcfd149f9 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb027b4aa9ffdcdd1fb148bb0157e54acd00dbbe
commit cb027b4aa9ffdcdd1fb148bb0157e54acd00dbbe
Merge: 1d515e5 81e73b7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 25 09:44:13 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 25 09:44:13 2016 -0400

    Merge topic 'FindCUDA-cublas_device' into next
    
    81e73b72 FindCUDA: Add support for finding the cublas_device library


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81e73b7240e3b11b454f01f21bab85b4aa95d6af
commit 81e73b7240e3b11b454f01f21bab85b4aa95d6af
Author:     James Sharpe <james.sharpe at zenotech.com>
AuthorDate: Wed May 25 11:28:39 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 25 09:42:25 2016 -0400

    FindCUDA: Add support for finding the cublas_device library

diff --git a/Help/release/dev/FindCUDA-cublas_device.rst b/Help/release/dev/FindCUDA-cublas_device.rst
new file mode 100644
index 0000000..2ceed60
--- /dev/null
+++ b/Help/release/dev/FindCUDA-cublas_device.rst
@@ -0,0 +1,4 @@
+FindCUDA-cublas_device
+----------------------
+
+* The :module:`FindCUDA` module learned to find the ``cublas_device`` library.
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 2979f0f..48bb554 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -549,6 +549,7 @@ macro(cuda_unset_include_and_libraries)
   endif()
   unset(CUDA_cudart_static_LIBRARY CACHE)
   unset(CUDA_cublas_LIBRARY CACHE)
+  unset(CUDA_cublas_device_LIBRARY CACHE)
   unset(CUDA_cublasemu_LIBRARY CACHE)
   unset(CUDA_cufft_LIBRARY CACHE)
   unset(CUDA_cufftemu_LIBRARY CACHE)
@@ -854,6 +855,7 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2")
   endif()
 endif()
 if(CUDA_VERSION VERSION_GREATER "5.0")
+  find_cuda_helper_libs(cublas_device)
   # In CUDA 5.5 NPP was splitted onto 3 separate libraries.
   find_cuda_helper_libs(nppc)
   find_cuda_helper_libs(nppi)
@@ -872,7 +874,7 @@ if (CUDA_BUILD_EMULATION)
   set(CUDA_CUBLAS_LIBRARIES ${CUDA_cublasemu_LIBRARY})
 else()
   set(CUDA_CUFFT_LIBRARIES ${CUDA_cufft_LIBRARY})
-  set(CUDA_CUBLAS_LIBRARIES ${CUDA_cublas_LIBRARY})
+  set(CUDA_CUBLAS_LIBRARIES ${CUDA_cublas_LIBRARY} ${CUDA_cublas_device_LIBRARY})
 endif()
 
 ########################
@@ -1803,7 +1805,7 @@ macro(CUDA_ADD_CUBLAS_TO_TARGET target)
   if (CUDA_BUILD_EMULATION)
     target_link_libraries(${target} ${CUDA_cublasemu_LIBRARY})
   else()
-    target_link_libraries(${target} ${CUDA_cublas_LIBRARY})
+    target_link_libraries(${target} ${CUDA_cublas_LIBRARY} ${CUDA_cublas_device_LIBRARY})
   endif()
 endmacro()
 

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

Summary of changes:
 Help/release/dev/FindCUDA-cublas_device.rst |    4 ++++
 Modules/FindCUDA.cmake                      |    6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 Help/release/dev/FindCUDA-cublas_device.rst


hooks/post-receive
-- 
CMake