kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'findcuda-use-correct-runtime-for-required' 

90d114ed FindCUDA: Use the correct runtime in REQUIRED_VARS check
This commit is contained in:
Brad King 2016-06-16 09:46:52 -04:00 committed by CMake Topic Stage
parent 290913fab8 90d114ed8c
commit 993991a07d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/FindCUDA.cmake
View File

@ -787,8 +787,10 @@ endif()
if(CUDA_cudart_static_LIBRARY) if(CUDA_cudart_static_LIBRARY)
# Set whether to use the static cuda runtime. # Set whether to use the static cuda runtime.
option(CUDA_USE_STATIC_CUDA_RUNTIME "Use the static version of the CUDA runtime library if available" ON) option(CUDA_USE_STATIC_CUDA_RUNTIME "Use the static version of the CUDA runtime library if available" ON)
set(CUDA_CUDART_LIBRARY_VAR CUDA_cudart_static_LIBRARY)
else() else()
option(CUDA_USE_STATIC_CUDA_RUNTIME "Use the static version of the CUDA runtime library if available" OFF) option(CUDA_USE_STATIC_CUDA_RUNTIME "Use the static version of the CUDA runtime library if available" OFF)
set(CUDA_CUDART_LIBRARY_VAR CUDA_CUDART_LIBRARY)
endif() endif()
if(CUDA_USE_STATIC_CUDA_RUNTIME) if(CUDA_USE_STATIC_CUDA_RUNTIME)
@ -1003,7 +1005,7 @@ find_package_handle_standard_args(CUDA
CUDA_TOOLKIT_ROOT_DIR CUDA_TOOLKIT_ROOT_DIR
CUDA_NVCC_EXECUTABLE CUDA_NVCC_EXECUTABLE
CUDA_INCLUDE_DIRS CUDA_INCLUDE_DIRS
CUDA_CUDART_LIBRARY ${CUDA_CUDART_LIBRARY_VAR}
VERSION_VAR VERSION_VAR
CUDA_VERSION CUDA_VERSION
) )