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  ae94988166f856e3ef03ba58f16efba93ffa7994 (commit)
       via  6c394bcb384ded1d609111fda2726ee35303f0fc (commit)
      from  b84b2d40fe7f0b88b919633893351c32762385c8 (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=ae94988166f856e3ef03ba58f16efba93ffa7994
commit ae94988166f856e3ef03ba58f16efba93ffa7994
Merge: b84b2d4 6c394bc
Author:     Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Mon Sep 19 14:28:15 2016 -0400
Commit:     CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 19 14:28:15 2016 -0400

    Merge topic 'cuda_use_cudadevrt_with_separable_compilation' into next
    
    6c394bcb FINDCUDA: find cudadevrt and link it if CUDA_SEPARABLE_COMPILATION 
is ON


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6c394bcb384ded1d609111fda2726ee35303f0fc
commit 6c394bcb384ded1d609111fda2726ee35303f0fc
Author:     Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Fri Sep 16 13:34:04 2016 +0200
Commit:     Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Mon Sep 19 13:46:25 2016 -0400

    FINDCUDA: find cudadevrt and link it if CUDA_SEPARABLE_COMPILATION is ON

diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 317a9cd..9ef1419 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -303,6 +303,8 @@
 #                            CUDA_ADD_CUBLAS_TO_TARGET macro).
 #   CUDA_cudart_static_LIBRARY -- Statically linkable cuda runtime library.
 #                                 Only available for CUDA version 5.5+
+#   CUDA_cudadevrt_LIBRARY -- Device runtime library.
+#                             Required for separable compilation.
 #   CUDA_cupti_LIBRARY    -- CUDA Profiling Tools Interface library.
 #                            Only available for CUDA version 4.0+.
 #   CUDA_curand_LIBRARY   -- CUDA Random Number Generation library.
@@ -564,6 +566,7 @@ macro(cuda_unset_include_and_libraries)
     unset(CUDA_CUDARTEMU_LIBRARY CACHE)
   endif()
   unset(CUDA_cudart_static_LIBRARY CACHE)
+  unset(CUDA_cudadevrt_LIBRARY CACHE)
   unset(CUDA_cublas_LIBRARY CACHE)
   unset(CUDA_cublas_device_LIBRARY CACHE)
   unset(CUDA_cublasemu_LIBRARY CACHE)
@@ -794,6 +797,10 @@ else()
   set(CUDA_USE_STATIC_CUDA_RUNTIME OFF CACHE INTERNAL "")
   set(CUDA_CUDART_LIBRARY_VAR CUDA_CUDART_LIBRARY)
 endif()
+if(NOT CUDA_VERSION VERSION_LESS "5.0")
+  cuda_find_library_local_first(CUDA_cudadevrt_LIBRARY cudadevrt 
"\"cudadevrt\" library")
+  mark_as_advanced(CUDA_cudadevrt_LIBRARY)
+endif()
 
 if(CUDA_USE_STATIC_CUDA_RUNTIME)
   if(UNIX)
@@ -1714,6 +1721,12 @@ macro(CUDA_ADD_LIBRARY cuda_target)
     ${CUDA_LIBRARIES}
     )
 
+  if(CUDA_SEPARABLE_COMPILATION)
+    target_link_libraries(${cuda_target}
+      ${CUDA_cudadevrt_LIBRARY}
+      )
+  endif()
+
   # We need to set the linker language based on what the expected generated 
file
   # would be. CUDA_C_OR_CXX is computed based on CUDA_HOST_COMPILATION_CPP.
   set_target_properties(${cuda_target}

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindCUDA.cmake |   13 +++++++++++++
 1 file changed, 13 insertions(+)


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Reply via email to