dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-04 14:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

FindCUDAToolkit searches stub location last

Browse Source 
Fixes #20252
This commit is contained in:
Robert Maynard
2020-04-09 09:42:22 -04:00
parent e3185e3d1b
commit 4f1e24efa0
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Modules/FindCUDAToolkit.cmake
View File

@@ -711,8 +711,15 @@ find_path(CUDAToolkit_INCLUDE_DIR
# And find the CUDA Runtime Library libcudart # And find the CUDA Runtime Library libcudart
find_library(CUDA_CUDART find_library(CUDA_CUDART
NAMES cudart NAMES cudart
PATH_SUFFIXES lib64 lib64/stubs lib/x64 PATH_SUFFIXES lib64 lib/x64
) )
if (NOT CUDA_CUDART)
find_library(CUDA_CUDART
NAMES cudart
PATH_SUFFIXES lib64/stubs lib/x64/stubs
)
endif()
if (NOT CUDA_CUDART AND NOT CUDAToolkit_FIND_QUIETLY) if (NOT CUDA_CUDART AND NOT CUDAToolkit_FIND_QUIETLY)
message(STATUS "Unable to find cudart library.") message(STATUS "Unable to find cudart library.")
endif() endif()
@@ -759,9 +766,20 @@ if(CUDAToolkit_FOUND)
NAMES ${search_names} NAMES ${search_names}
HINTS ${CUDAToolkit_LIBRARY_DIR} HINTS ${CUDAToolkit_LIBRARY_DIR}
ENV CUDA_PATH ENV CUDA_PATH
PATH_SUFFIXES nvidia/current lib64 lib64/stubs lib/x64 lib lib/stubs PATH_SUFFIXES nvidia/current lib64 lib/x64 lib
${arg_EXTRA_PATH_SUFFIXES} ${arg_EXTRA_PATH_SUFFIXES}
) )
# Don't try any stub directories intil we have exhausted all other
# search locations.
if(NOT CUDA_${lib_name}_LIBRARY)
find_library(CUDA_${lib_name}_LIBRARY
NAMES ${search_names}
HINTS ${CUDAToolkit_LIBRARY_DIR}
ENV CUDA_PATH
PATH_SUFFIXES lib64/stubs lib/x64/stubs lib/stubs stubs
)
endif()
mark_as_advanced(CUDA_${lib_name}_LIBRARY) mark_as_advanced(CUDA_${lib_name}_LIBRARY)
if (NOT TARGET CUDA::${lib_name} AND CUDA_${lib_name}_LIBRARY) if (NOT TARGET CUDA::${lib_name} AND CUDA_${lib_name}_LIBRARY)