[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-267-g0d3c95e

[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  0d3c95e99e875c846381c472e6e1f066d42eb019 (commit)
       via  5537355afc62328bd3c8dce879862887190e9821 (commit)
       via  06ee543c00971cd6d52a41da146fdbc9317fd5f7 (commit)
      from  63bc1a824aa06ec90bde12603d6bfaa612a80462 (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=0d3c95e99e875c846381c472e6e1f066d42eb019
commit 0d3c95e99e875c846381c472e6e1f066d42eb019
Merge: 63bc1a8 5537355
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Mon Jun 13 09:56:36 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 13 09:56:36 2016 -0400

    Merge topic 'findcuda-use-correct-runtime-for-required' into next
    
    5537355a FindCUDA: Use the correct runtime in REQUIRED_VARS check
    06ee543c CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5537355afc62328bd3c8dce879862887190e9821
commit 5537355afc62328bd3c8dce879862887190e9821
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 09:44:04 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 Issue #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:
 Modules/FindCUDA.cmake    |    4 +++-
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake