kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'find-cuda-dl' 

b1efb023 FindCUDA: drop CUDA_dl_LIBRARY
This commit is contained in:
Brad King 2015-11-04 10:13:29 -05:00 committed by CMake Topic Stage
parent 49ac682d39 b1efb0233e
commit 7a37936adf
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/FindCUDA.cmake
View File

@ -764,13 +764,9 @@ if(CUDA_USE_STATIC_CUDA_RUNTIME)
if (NOT APPLE) if (NOT APPLE)
# Here is librt that has things such as, clock_gettime, shm_open, and shm_unlink. # Here is librt that has things such as, clock_gettime, shm_open, and shm_unlink.
find_library(CUDA_rt_LIBRARY rt) find_library(CUDA_rt_LIBRARY rt)
find_library(CUDA_dl_LIBRARY dl)
if (NOT CUDA_rt_LIBRARY) if (NOT CUDA_rt_LIBRARY)
message(WARNING "Expecting to find librt for libcudart_static, but didn't find it.") message(WARNING "Expecting to find librt for libcudart_static, but didn't find it.")
endif() endif()
if (NOT CUDA_dl_LIBRARY)
message(WARNING "Expecting to find libdl for libcudart_static, but didn't find it.")
endif()
endif() endif()
endif() endif()
endif() endif()
@ -793,13 +789,10 @@ set(CUDA_LIBRARIES)
if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY) if(CUDA_BUILD_EMULATION AND CUDA_CUDARTEMU_LIBRARY)
list(APPEND CUDA_LIBRARIES ${CUDA_CUDARTEMU_LIBRARY}) list(APPEND CUDA_LIBRARIES ${CUDA_CUDARTEMU_LIBRARY})
elseif(CUDA_USE_STATIC_CUDA_RUNTIME AND CUDA_cudart_static_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) if (CUDA_rt_LIBRARY)
list(APPEND CUDA_LIBRARIES ${CUDA_rt_LIBRARY}) list(APPEND CUDA_LIBRARIES ${CUDA_rt_LIBRARY})
endif() endif()
if (CUDA_dl_LIBRARY)
list(APPEND CUDA_LIBRARIES ${CUDA_dl_LIBRARY})
endif()
if(APPLE) if(APPLE)
# We need to add the default path to the driver (libcuda.dylib) as an rpath, so that # 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. # the static cuda runtime can find it at runtime.