diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-09 13:59:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-09 14:00:03 (GMT) |
| commit | 070810b324aff78394c064be7674c57e5392064f (patch) | |
| tree | 2bb75dae8893df384009821edc129bd2b90c52cc | |
| parent | de66a70b738f52309e5fcb9e7b3c59b7e7e97522 (diff) | |
| parent | 4a3cafec4ff195ec86ac60d693ec502b3fca58f2 (diff) | |
| download | CMake-070810b324aff78394c064be7674c57e5392064f.zip CMake-070810b324aff78394c064be7674c57e5392064f.tar.gz CMake-070810b324aff78394c064be7674c57e5392064f.tar.bz2 | |
Merge topic 'FindCUDAToolkit-cudart-deps' into release-3.29
4a3cafec4f FindCUDAToolkit: Fix cudart dependencies
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9236
| -rw-r--r-- | Modules/FindCUDAToolkit.cmake | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake index ac72c17..1eaf36b 100644 --- a/Modules/FindCUDAToolkit.cmake +++ b/Modules/FindCUDAToolkit.cmake @@ -1139,18 +1139,12 @@ if(CUDAToolkit_FOUND) _CUDAToolkit_find_and_add_import_lib(cuda_driver ALT cuda) - _CUDAToolkit_find_and_add_import_lib(cudart) - _CUDAToolkit_find_and_add_import_lib(cudart_static) - # setup dependencies that are required for cudart_static when building + # setup dependencies that are required for cudart/cudart_static when building # on linux. These are generally only required when using the CUDA toolkit # when CUDA language is disabled - if(NOT TARGET CUDA::cudart_static_deps - AND TARGET CUDA::cudart_static) - + if(NOT TARGET CUDA::cudart_static_deps) add_library(CUDA::cudart_static_deps IMPORTED INTERFACE) - target_link_libraries(CUDA::cudart_static INTERFACE CUDA::cudart_static_deps) - if(UNIX AND (CMAKE_C_COMPILER OR CMAKE_CXX_COMPILER)) find_package(Threads REQUIRED) target_link_libraries(CUDA::cudart_static_deps INTERFACE Threads::Threads ${CMAKE_DL_LIBS}) @@ -1168,6 +1162,9 @@ if(CUDAToolkit_FOUND) endif() endif() + _CUDAToolkit_find_and_add_import_lib(cudart DEPS cudart_static_deps) + _CUDAToolkit_find_and_add_import_lib(cudart_static DEPS cudart_static_deps) + if(CUDAToolkit_VERSION VERSION_GREATER_EQUAL 12.0.0) _CUDAToolkit_find_and_add_import_lib(nvJitLink) _CUDAToolkit_find_and_add_import_lib(nvJitLink_static DEPS cudart_static_deps) |