This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 6efb9214e46763a2a731938e3948fc8751f51167 (commit) via 90d114ed8c724ca49fa02444dd59d06fd9806f3b (commit) from 68b0ed4e365c77d1eb2109b17fa11d358f1a575b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6efb9214e46763a2a731938e3948fc8751f51167 commit 6efb9214e46763a2a731938e3948fc8751f51167 Merge: 68b0ed4 90d114e Author: Chuck Atkins <chuck.atk...@kitware.com> AuthorDate: Tue Jun 14 09:56:45 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Jun 14 09:56:45 2016 -0400 Merge topic 'findcuda-use-correct-runtime-for-required' into next 90d114ed FindCUDA: Use the correct runtime in REQUIRED_VARS check https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90d114ed8c724ca49fa02444dd59d06fd9806f3b commit 90d114ed8c724ca49fa02444dd59d06fd9806f3b Author: Chuck Atkins <chuck.atk...@kitware.com> AuthorDate: Mon Jun 13 09:39:15 2016 -0400 Commit: Chuck Atkins <chuck.atk...@kitware.com> CommitDate: Tue Jun 14 09:55:35 2016 -0400 FindCUDA: Use the correct runtime in REQUIRED_VARS check When enabling the CUDA static runtime, the current module always uses the shared runtime in the REQUIRED_VARS check. This change should select the correct runtime to be checked for as required based on the CUDA_USE_STATIC_CUDA_RUNTIME option. Fixes #16096 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 ) ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits