summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-12-04 19:17:28 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-12-04 19:17:37 (GMT)
commit73848a75e84cd265acba897c6dc3ace3099a8bc9 (patch)
treec4e2d044a79fdf5e6f2c6a8ef5139dbf11b9ba2d /Modules
parentf7ca8fc24ccb4e7724d2228d9997b2df99e71133 (diff)
parent974220b714e63567bde9eccd459f58b213011d69 (diff)
downloadCMake-73848a75e84cd265acba897c6dc3ace3099a8bc9.zip
CMake-73848a75e84cd265acba897c6dc3ace3099a8bc9.tar.gz
CMake-73848a75e84cd265acba897c6dc3ace3099a8bc9.tar.bz2
Merge topic 'cuda_lang_specifies_cmake_library_arch'
974220b714 CUDA: persist CMAKE_LIBRARY_ARCHITECTURE and CUDA version Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4090
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CMakeCUDACompiler.cmake.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/CMakeCUDACompiler.cmake.in b/Modules/CMakeCUDACompiler.cmake.in
index 711129a..e012abf 100644
--- a/Modules/CMakeCUDACompiler.cmake.in
+++ b/Modules/CMakeCUDACompiler.cmake.in
@@ -17,6 +17,11 @@ set(CMAKE_CUDA_SOURCE_FILE_EXTENSIONS cu)
set(CMAKE_CUDA_LINKER_PREFERENCE 15)
set(CMAKE_CUDA_LINKER_PREFERENCE_PROPAGATES 1)
+set(CMAKE_CUDA_LIBRARY_ARCHITECTURE "@CMAKE_CUDA_LIBRARY_ARCHITECTURE@")
+if(CMAKE_CUDA_LIBRARY_ARCHITECTURE)
+ set(CMAKE_LIBRARY_ARCHITECTURE "@CMAKE_CUDA_LIBRARY_ARCHITECTURE@")
+endif()
+
set(CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES "@CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES@")
set(CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES "@CMAKE_CUDA_HOST_IMPLICIT_LINK_LIBRARIES@")