Ver código fonte

Merge topic 'FindCUDAToolkit-fix-stubs' into release-3.28

d85bf99bcb FindCUDAToolkit: Fix stub library representation on reconfigure

Acked-by: Kitware Robot <[email protected]>
Acked-by: Robert Maynard <[email protected]>
Merge-request: !9045
Brad King 1 ano atrás
pai
commit
2d60f5c7a6
1 arquivos alterados com 7 adições e 5 exclusões
  1. 7 5
      Modules/FindCUDAToolkit.cmake

+ 7 - 5
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)