diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-26 13:52:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-26 13:52:04 (GMT) |
| commit | 903bcbc39e2455e5467cf1db6ac48114f6c4bd57 (patch) | |
| tree | e3b615e518f1f550257fc23b79d121bcb877c2d6 | |
| parent | 2a028b78982f4509ba163900319c2dac7077bc52 (diff) | |
| parent | 81e73b7240e3b11b454f01f21bab85b4aa95d6af (diff) | |
| download | CMake-903bcbc39e2455e5467cf1db6ac48114f6c4bd57.zip CMake-903bcbc39e2455e5467cf1db6ac48114f6c4bd57.tar.gz CMake-903bcbc39e2455e5467cf1db6ac48114f6c4bd57.tar.bz2 | |
Merge topic 'FindCUDA-cublas_device'
81e73b72 FindCUDA: Add support for finding the cublas_device library
| -rw-r--r-- | Help/release/dev/FindCUDA-cublas_device.rst | 4 | ||||
| -rw-r--r-- | Modules/FindCUDA.cmake | 6 |
2 files changed, 8 insertions, 2 deletions
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() |