diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-16 13:46:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-16 13:46:52 (GMT) |
| commit | 993991a07de48079233b3a04902a1f34ddfb97df (patch) | |
| tree | e3f3da2d0c97efc7c3dcd51558468d8753790de2 /Modules | |
| parent | 290913fab871eddee22e6ebadd3eb7ef48c1485b (diff) | |
| parent | 90d114ed8c724ca49fa02444dd59d06fd9806f3b (diff) | |
| download | CMake-993991a07de48079233b3a04902a1f34ddfb97df.zip CMake-993991a07de48079233b3a04902a1f34ddfb97df.tar.gz CMake-993991a07de48079233b3a04902a1f34ddfb97df.tar.bz2 | |
Merge topic 'findcuda-use-correct-runtime-for-required'
90d114ed FindCUDA: Use the correct runtime in REQUIRED_VARS check
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCUDA.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 86f89d8..81fc7a8 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -787,8 +787,10 @@ endif() if(CUDA_cudart_static_LIBRARY) # 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) + set(CUDA_CUDART_LIBRARY_VAR CUDA_cudart_static_LIBRARY) else() 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() if(CUDA_USE_STATIC_CUDA_RUNTIME) @@ -1003,7 +1005,7 @@ find_package_handle_standard_args(CUDA CUDA_TOOLKIT_ROOT_DIR CUDA_NVCC_EXECUTABLE CUDA_INCLUDE_DIRS - CUDA_CUDART_LIBRARY + ${CUDA_CUDART_LIBRARY_VAR} VERSION_VAR CUDA_VERSION ) |