diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-08 12:26:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-05-08 12:26:46 (GMT) |
| commit | 6ab7267d2a7265dff467c3c5a47421a259d7d406 (patch) | |
| tree | 9e67e2aaa0fa38138846cf38d94ceaa086bfcfa3 /Modules | |
| parent | f1344ca2adbca2ec2385886eeed65bf01966be8f (diff) | |
| parent | 9a66345752316126783f0bb2b3aa3d51a89e3e50 (diff) | |
| download | CMake-6ab7267d2a7265dff467c3c5a47421a259d7d406.zip CMake-6ab7267d2a7265dff467c3c5a47421a259d7d406.tar.gz CMake-6ab7267d2a7265dff467c3c5a47421a259d7d406.tar.bz2 | |
Merge topic 'FindCUDA-revert-sepcomp-cublas'
9a66345752 FindCUDA: Fix regression in separable compilation without cublas
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2048
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCUDA.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index a0e4aa9..dc55e86 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1769,7 +1769,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options add_custom_command( OUTPUT ${output_file} DEPENDS ${object_files} - COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} -dlink ${object_files} ${CUDA_cublas_device_LIBRARY} -o ${output_file} + COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} -dlink ${object_files} -o ${output_file} ${flags} COMMENT "Building NVCC intermediate link file ${output_file_relative_path}" COMMAND_EXPAND_LISTS @@ -1782,7 +1782,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options PRE_LINK COMMAND ${CMAKE_COMMAND} -E echo "Building NVCC intermediate link file ${output_file_relative_path}" COMMAND ${CMAKE_COMMAND} -E make_directory "${output_file_dir}" - COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} ${flags} -dlink ${object_files} ${CUDA_cublas_device_LIBRARY} -o "${output_file}" + COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} ${flags} -dlink ${object_files} -o "${output_file}" COMMAND_EXPAND_LISTS ${_verbatim} ) |