mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-08 14:50:10 -06:00
CUDA: Cuda* tests add rpath entry only for need cuda lib directory
Found when developing https://github.com/conda-forge/cuda-nvcc-feedstock/pull/13/ We previously added RPATH entries for all implicit directories and therefore started to load the incorrect pthread library.
This commit is contained in:
@@ -53,5 +53,6 @@ endif()
|
||||
if(UNIX)
|
||||
# Help the shared cuda runtime find libcudart as it is not located
|
||||
# in a default system searched location
|
||||
set_property(TARGET CudaComplexMixedLib PROPERTY BUILD_RPATH ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES})
|
||||
find_package(CUDAToolkit REQUIRED)
|
||||
set_property(TARGET CudaComplexMixedLib PROPERTY BUILD_RPATH "${CUDAToolkit_LIBRARY_DIR}")
|
||||
endif()
|
||||
|
||||
@@ -40,5 +40,6 @@ target_link_libraries(CudaOnlySharedRuntimePlusToolkit PRIVATE SharedToolkit
|
||||
if(UNIX)
|
||||
# Help the shared cuda runtime find libcudart as it is not located
|
||||
# in a default system searched location
|
||||
set_property(TARGET CudaOnlySharedRuntimePlusToolkit PROPERTY BUILD_RPATH ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES})
|
||||
find_package(CUDAToolkit REQUIRED)
|
||||
set_property(TARGET CudaOnlySharedRuntimePlusToolkit PROPERTY BUILD_RPATH "${CUDAToolkit_LIBRARY_DIR}")
|
||||
endif()
|
||||
|
||||
@@ -11,5 +11,6 @@ add_executable(CudaOnlySharedRuntimeViaCUDAFlags main.cu)
|
||||
if(UNIX)
|
||||
# Help the shared cuda runtime find libcudart as it is not located
|
||||
# in a default system searched location
|
||||
set_property(TARGET CudaOnlySharedRuntimeViaCUDAFlags PROPERTY BUILD_RPATH ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES})
|
||||
find_package(CUDAToolkit REQUIRED)
|
||||
set_property(TARGET CudaOnlySharedRuntimeViaCUDAFlags PROPERTY BUILD_RPATH "${CUDAToolkit_LIBRARY_DIR}")
|
||||
endif()
|
||||
|
||||
@@ -39,5 +39,6 @@ target_link_libraries(CudaOnlyStaticRuntimePlusToolkit PRIVATE SharedToolkit
|
||||
if(UNIX)
|
||||
# Help the shared cuda runtime find libcurand and libnppif when they are not located
|
||||
# in a default system searched location
|
||||
set_property(TARGET CudaOnlyStaticRuntimePlusToolkit PROPERTY BUILD_RPATH ${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES})
|
||||
find_package(CUDAToolkit REQUIRED)
|
||||
set_property(TARGET CudaOnlyStaticRuntimePlusToolkit PROPERTY BUILD_RPATH "${CUDAToolkit_LIBRARY_DIR}")
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user