summaryrefslogtreecommitdiffstats
path: root/Modules/FindCUDA.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-06-27 13:21:02 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-06-27 13:21:15 (GMT)
commit4fd6507a528ab1a9858eee2914e8d5a2b92bffdb (patch)
treeb5392de731a368bc6b3aec711b366a177d4de9c4 /Modules/FindCUDA.cmake
parent33d6145f873029577e3498b843b6ef5646c594b8 (diff)
parenta3e442bbfc8374c90aec9836ee40aa35a43c1bc2 (diff)
downloadCMake-4fd6507a528ab1a9858eee2914e8d5a2b92bffdb.zip
CMake-4fd6507a528ab1a9858eee2914e8d5a2b92bffdb.tar.gz
CMake-4fd6507a528ab1a9858eee2914e8d5a2b92bffdb.tar.bz2
Merge topic 'FindCUDA-no-empty-genex'
a3e442bb FindCUDA: Fix CUDA_NVCC_FLAGS_<CONFIG> for separable compilation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1008
Diffstat (limited to 'Modules/FindCUDA.cmake')
-rw-r--r--Modules/FindCUDA.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake
index 77ca351..5dc55d4 100644
--- a/Modules/FindCUDA.cmake
+++ b/Modules/FindCUDA.cmake
@@ -1702,6 +1702,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
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
${_verbatim}
)
else()
@@ -1712,6 +1713,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
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} -o "${output_file}"
+ COMMAND_EXPAND_LISTS
${_verbatim}
)
endif()