diff options
| author | Brad King <brad.king@kitware.com> | 2015-11-04 15:13:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-11-04 15:13:29 (GMT) |
| commit | 7a37936adfce70edab7048a311bf9cf4e9a0f61c (patch) | |
| tree | 6f45793db2982c84d7e830eb5ed6d7510a44e2eb /Modules | |
| parent | 49ac682d39af7fe47e79455827e2e83130193236 (diff) | |
| parent | b1efb0233e9c925090bf1eb44c3c1cfb8e186764 (diff) | |
| download | CMake-7a37936adfce70edab7048a311bf9cf4e9a0f61c.zip CMake-7a37936adfce70edab7048a311bf9cf4e9a0f61c.tar.gz CMake-7a37936adfce70edab7048a311bf9cf4e9a0f61c.tar.bz2 | |
Merge topic 'find-cuda-dl'
b1efb023 FindCUDA: drop CUDA_dl_LIBRARY
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCUDA.cmake | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 1fc582f..6a21078 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -764,13 +764,9 @@ if(CUDA_USE_STATIC_CUDA_RUNTIME) if (NOT APPLE) # Here is librt that has things such as, clock_gettime, shm_open, and shm_unlink. find_library(CUDA_rt_LIBRARY rt) - find_library(CUDA_dl_LIBRARY dl) if (NOT CUDA_rt_LIBRARY) message(WARNING "Expecting to find librt for libcudart_static, but didn't find it.") endif() - if (NOT CUDA_dl_LIBRARY) - message(WARNING "Expecting to find libdl for libcudart_static, but didn't find it.") - endif() endif() endif() endif() @@ -793,13 +789,10 @@ set(CUDA_LIBRARIES) if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY) list(APPEND CUDA_LIBRARIES ${CUDA_CUDARTEMU_LIBRARY}) elseif(CUDA_USE_STATIC_CUDA_RUNTIME AND CUDA_cudart_static_LIBRARY) - list(APPEND CUDA_LIBRARIES ${CUDA_cudart_static_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) + list(APPEND CUDA_LIBRARIES ${CUDA_cudart_static_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}) if (CUDA_rt_LIBRARY) list(APPEND CUDA_LIBRARIES ${CUDA_rt_LIBRARY}) endif() - if (CUDA_dl_LIBRARY) - list(APPEND CUDA_LIBRARIES ${CUDA_dl_LIBRARY}) - endif() if(APPLE) # We need to add the default path to the driver (libcuda.dylib) as an rpath, so that # the static cuda runtime can find it at runtime. |