[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-279-gfba0b6b

[Chuck Atkins]

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  fba0b6b15f0528bf88da45b3fdaca304552bd255 (commit)
       via  25aa576db0294187a20f478ad83aa101d7d57801 (commit)
      from  1e493167950e427062417500f225862904c145dc (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=fba0b6b15f0528bf88da45b3fdaca304552bd255
commit fba0b6b15f0528bf88da45b3fdaca304552bd255
Merge: 1e49316 25aa576
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Jun 13 10:21:41 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 13 10:21:41 2016 -0400

    Merge topic 'findcuda-use-correct-runtime-for-required' into next
    
    25aa576d FindCUDA: Use the correct runtime in REQUIRED_VARS check


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25aa576db0294187a20f478ad83aa101d7d57801
commit 25aa576db0294187a20f478ad83aa101d7d57801
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Jun 13 09:39:15 2016 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Mon Jun 13 10:21:13 2016 -0400

    FindCUDA: Use the correct runtime in REQUIRED_VARS check
    
    When enabling the CUDA static runtime, the current module always uses
    the shared truntime 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