diff options
| author | Brad King <brad.king@kitware.com> | 2018-05-08 12:38:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-05-08 12:38:46 (GMT) |
| commit | 0df2e3063858d452e3091739774024a9d4567203 (patch) | |
| tree | 5c3d1727b941536fcb344feb152ba8fb73ebf990 | |
| parent | c400cd4f3a0ca99882bb2cbba9329447642405cd (diff) | |
| parent | 9a66345752316126783f0bb2b3aa3d51a89e3e50 (diff) | |
| download | CMake-0df2e3063858d452e3091739774024a9d4567203.zip CMake-0df2e3063858d452e3091739774024a9d4567203.tar.gz CMake-0df2e3063858d452e3091739774024a9d4567203.tar.bz2 | |
Merge branch 'FindCUDA-revert-sepcomp-cublas' into release-3.11
Merge-request: !2048
| -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 0a31ac2..e3cb4fe 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -1760,7 +1760,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 @@ -1773,7 +1773,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} ) |