diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-22 17:39:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-22 17:39:27 (GMT) |
| commit | dae2bddf5a53f1d891452bbf1c64e65e7833e9c9 (patch) | |
| tree | bb2b87c15e91784ef4d6d57a09e19e0a31a85b7e /Modules | |
| parent | 7303a9677659f29723cd14030629f476edc2d32c (diff) | |
| parent | 59814cb43004ac299b4f0778825b8a3e23515602 (diff) | |
| download | CMake-dae2bddf5a53f1d891452bbf1c64e65e7833e9c9.zip CMake-dae2bddf5a53f1d891452bbf1c64e65e7833e9c9.tar.gz CMake-dae2bddf5a53f1d891452bbf1c64e65e7833e9c9.tar.bz2 | |
Merge branch 'cuda-rpath-osx' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCUDA.cmake | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 2e2b21c..3dd975c 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -703,18 +703,6 @@ if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY) else() set(CUDA_LIBRARIES ${CUDA_CUDART_LIBRARY}) endif() -if(APPLE) - # We need to add the path to cudart to the linker using rpath, since the - # library name for the cuda libraries is prepended with @rpath. - if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY) - get_filename_component(_cuda_path_to_cudart "${CUDA_CUDARTEMU_LIBRARY}" PATH) - else() - get_filename_component(_cuda_path_to_cudart "${CUDA_CUDART_LIBRARY}" PATH) - endif() - if(_cuda_path_to_cudart) - list(APPEND CUDA_LIBRARIES -Wl,-rpath "-Wl,${_cuda_path_to_cudart}") - endif() -endif() # 1.1 toolkit on linux doesn't appear to have a separate library on # some platforms. |