From 974220b714e63567bde9eccd459f58b213011d69 Mon Sep 17 00:00:00 2001 From: Robert Maynard <robert.maynard@kitware.com> Date: Tue, 26 Nov 2019 08:47:22 -0500 Subject: CUDA: persist CMAKE_LIBRARY_ARCHITECTURE and CUDA version The CUDA language failed to persist CMAKE_CUDA_LIBRARY_ARCHITECTURE and CMAKE_LIBRARY_ARCHITECTURE, causing find_ calls to fail when the only enabled language was CUDA. --- Modules/CMakeCUDACompiler.cmake.in | 5 +++++ 1 file changed, 5 insertions(+) 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@") -- cgit v0.12