kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FindCUDA: Support special characters in path (#15919) 

Add `VERBATIM` to all `add_custom_command` calls so that CMake will
escape arguments properly even when special characters such as "()" are
present.

Suggested-by: Nils Gladitz <nilsgladitz@gmail.com>
This commit is contained in:
Brad King 2016-01-15 08:44:15 -05:00
parent 43a32bdff6
commit 6ccc307053
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/FindCUDA.cmake
View File

@ -1474,6 +1474,7 @@ macro(CUDA_WRAP_SRCS cuda_target format generated_files)
-P "${custom_target_script}" -P "${custom_target_script}"
WORKING_DIRECTORY "${cuda_compile_intermediate_directory}" WORKING_DIRECTORY "${cuda_compile_intermediate_directory}"
COMMENT "${cuda_build_comment_string}" COMMENT "${cuda_build_comment_string}"
VERBATIM
) )
# Make sure the build system knows the file is generated. # Make sure the build system knows the file is generated.
@ -1592,6 +1593,7 @@ function(CUDA_LINK_SEPARABLE_COMPILATION_OBJECTS output_file cuda_target options
COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} -dlink ${object_files} -o ${output_file} COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} -dlink ${object_files} -o ${output_file}
${flags} ${flags}
COMMENT "Building NVCC intermediate link file ${output_file_relative_path}" COMMENT "Building NVCC intermediate link file ${output_file_relative_path}"
VERBATIM
) )
else() else()
get_filename_component(output_file_dir "${output_file}" DIRECTORY) get_filename_component(output_file_dir "${output_file}" DIRECTORY)
@ -1601,6 +1603,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 echo "Building NVCC intermediate link file ${output_file_relative_path}"
COMMAND ${CMAKE_COMMAND} -E make_directory "${output_file_dir}" COMMAND ${CMAKE_COMMAND} -E make_directory "${output_file_dir}"
COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} ${flags} -dlink ${object_files} -o "${output_file}" COMMAND ${CUDA_NVCC_EXECUTABLE} ${nvcc_flags} ${flags} -dlink ${object_files} -o "${output_file}"
VERBATIM
) )
endif() endif()
endif() endif()