summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-01-25 13:41:15 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-01-25 13:41:15 (GMT)
commit9006ec1d9b7d738f690c32d673443b8851887f16 (patch)
tree8b4783940e5e4a4bf0968ff5b05e5f0562922db9
parenta007f15344007a6261209a409c6988b0e4c4b7e0 (diff)
parentdf3353d1f9b4cebc46018fd8fb6c601d038747c1 (diff)
downloadCMake-9006ec1d9b7d738f690c32d673443b8851887f16.zip
CMake-9006ec1d9b7d738f690c32d673443b8851887f16.tar.gz
CMake-9006ec1d9b7d738f690c32d673443b8851887f16.tar.bz2
Merge topic 'cuda_linker_preference'
df3353d1 CUDA: set linker preference between C and C++
-rw-r--r--Modules/CMakeCUDACompiler.cmake.in2
1 files changed, 1 insertions, 1 deletions
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@")