diff options
| author | Brad King <brad.king@kitware.com> | 2023-05-23 15:04:50 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-05-23 15:05:01 (GMT) |
| commit | 6503ce94349e30b0ca5bba76ba0dd2279126fd92 (patch) | |
| tree | 7decef841b144fda99ac96d01d14df928f8f24c8 /Tests | |
| parent | 77aaf1b04a6d1686d0a1340b0a96e87a46260930 (diff) | |
| parent | 4f10111e950de87106677d309a0f41356eff34af (diff) | |
| download | CMake-6503ce94349e30b0ca5bba76ba0dd2279126fd92.zip CMake-6503ce94349e30b0ca5bba76ba0dd2279126fd92.tar.gz CMake-6503ce94349e30b0ca5bba76ba0dd2279126fd92.tar.bz2 | |
Merge topic 'correct_cuda_complex_adding_bad_rpath_entries'
4f10111e95 CUDA: Cuda* tests add rpath entry only for need cuda lib directory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8473
Diffstat (limited to 'Tests')
4 files changed, 8 insertions, 4 deletions
diff --git a/Tests/Cuda/Complex/CMakeLists.txt b/Tests/Cuda/Complex/CMakeLists.txt index 63defdf..e252304 100644 --- a/Tests/Cuda/Complex/CMakeLists.txt +++ b/Tests/Cuda/Complex/CMakeLists.txt @@ -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() diff --git a/Tests/CudaOnly/SharedRuntimePlusToolkit/CMakeLists.txt b/Tests/CudaOnly/SharedRuntimePlusToolkit/CMakeLists.txt index 0b01085..7dc919f 100644 --- a/Tests/CudaOnly/SharedRuntimePlusToolkit/CMakeLists.txt +++ b/Tests/CudaOnly/SharedRuntimePlusToolkit/CMakeLists.txt @@ -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() diff --git a/Tests/CudaOnly/SharedRuntimeViaCUDAFlags/CMakeLists.txt b/Tests/CudaOnly/SharedRuntimeViaCUDAFlags/CMakeLists.txt index 24ff478..cf6eef2 100644 --- a/Tests/CudaOnly/SharedRuntimeViaCUDAFlags/CMakeLists.txt +++ b/Tests/CudaOnly/SharedRuntimeViaCUDAFlags/CMakeLists.txt @@ -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() diff --git a/Tests/CudaOnly/StaticRuntimePlusToolkit/CMakeLists.txt b/Tests/CudaOnly/StaticRuntimePlusToolkit/CMakeLists.txt index ae03b66..8149060 100644 --- a/Tests/CudaOnly/StaticRuntimePlusToolkit/CMakeLists.txt +++ b/Tests/CudaOnly/StaticRuntimePlusToolkit/CMakeLists.txt @@ -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() |