diff options
| author | Brad King <brad.king@kitware.com> | 2023-12-07 15:57:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-12-07 15:57:21 (GMT) |
| commit | 52d854e93bdd2b3ddb2faba20c56730f91d4fe6f (patch) | |
| tree | 36078bd5a3ec1a33123a5f41065c4a7e3d240bf6 | |
| parent | a4b1541b3a3425427cd9f978b2aacf2faabef13b (diff) | |
| parent | d85bf99bcb52577e065458fdb4486eff7c67456b (diff) | |
| download | CMake-52d854e93bdd2b3ddb2faba20c56730f91d4fe6f.zip CMake-52d854e93bdd2b3ddb2faba20c56730f91d4fe6f.tar.gz CMake-52d854e93bdd2b3ddb2faba20c56730f91d4fe6f.tar.bz2 | |
Merge topic 'FindCUDAToolkit-fix-stubs'
d85bf99bcb FindCUDAToolkit: Fix stub library representation on reconfigure
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !9045
| -rw-r--r-- | Modules/FindCUDAToolkit.cmake | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake index 0a22e63..f1b9684 100644 --- a/Modules/FindCUDAToolkit.cmake +++ b/Modules/FindCUDAToolkit.cmake @@ -1096,11 +1096,13 @@ if(CUDAToolkit_FOUND) ENV CUDA_PATH PATH_SUFFIXES lib64/stubs lib/x64/stubs lib/stubs stubs ) - if(CUDA_${lib_name}_LIBRARY AND NOT WIN32) - # Use `IMPORTED_IMPLIB` so that we don't add a `-rpath` entry for stub directories - set(CUDA_IMPORT_PROPERTY IMPORTED_IMPLIB) - set(CUDA_IMPORT_TYPE SHARED) - endif() + endif() + if(CUDA_${lib_name}_LIBRARY MATCHES "/stubs/" AND NOT WIN32) + # Use a SHARED library with IMPORTED_IMPLIB, but not IMPORTED_LOCATION, + # to indicate that the stub is for linkers but not dynamic loaders. + # It will not contribute any RPATH entry. + set(CUDA_IMPORT_PROPERTY IMPORTED_IMPLIB) + set(CUDA_IMPORT_TYPE SHARED) endif() mark_as_advanced(CUDA_${lib_name}_LIBRARY) |