[Cmake-commits] CMake branch, next, updated. v3.7.2-2311-g3688454

[Brad King]

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  368845459f43438e239663171cb38125915d5080 (commit)
       via  df3353d1f9b4cebc46018fd8fb6c601d038747c1 (commit)
      from  8ccf48b37ada48d940e7a525cab2354ded7f3794 (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=368845459f43438e239663171cb38125915d5080
commit 368845459f43438e239663171cb38125915d5080
Merge: 8ccf48b df3353d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 15:44:47 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 15:44:47 2017 -0500

    Merge topic 'cuda_linker_preference' into next
    
    df3353d1 CUDA: set linker preference between C and C++


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df3353d1f9b4cebc46018fd8fb6c601d038747c1
commit df3353d1f9b4cebc46018fd8fb6c601d038747c1
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Jan 17 15:09:22 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 24 15:43:43 2017 -0500

    CUDA: set linker preference between C and C++

diff --git a/Modules/CMakeCUDACompiler.cmake.in b/Modules/CMakeCUDACompiler.cmake.in
index 7e8efa7..158d12b 100644
--- a/Modules/CMakeCUDACompiler.cmake.in
+++ b/Modules/CMakeCUDACompiler.cmake.in
@@ -13,7 +13,7 @@ set(CMAKE_CUDA_HOST_COMPILER_ENV_VAR "CUDAHOSTCXX")
 
 set(CMAKE_CUDA_COMPILER_ID_RUN 1)
 set(CMAKE_CUDA_SOURCE_FILE_EXTENSIONS cu)
-set(CMAKE_CUDA_LINKER_PREFERENCE 10)
+set(CMAKE_CUDA_LINKER_PREFERENCE 15)
 set(CMAKE_CUDA_LINKER_PREFERENCE_PROPAGATES 1)
 
 set(CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES "@CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES@")

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

Summary of changes:
 Modules/CMakeCUDACompiler.cmake.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake