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

Reordered the arguments, so that user generated arguments go last and thus get precedence.

This commit is contained in:
James Bigler 2010-01-08 12:14:21 -05:00
parent d3034f9b56
commit 2316e04d13
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Modules/FindCUDA/run_nvcc.cmake
View File

@ -168,14 +168,14 @@ endif()
cuda_execute_process( cuda_execute_process(
"Generating dependency file: ${NVCC_generated_dependency_file}" "Generating dependency file: ${NVCC_generated_dependency_file}"
COMMAND "${CUDA_NVCC_EXECUTABLE}" COMMAND "${CUDA_NVCC_EXECUTABLE}"
"${source_file}"
${depends_CUDA_NVCC_FLAGS}
${nvcc_flags}
${CCBIN}
${nvcc_host_compiler_flags}
-DNVCC
-M -M
"${source_file}"
-o "${NVCC_generated_dependency_file}" -o "${NVCC_generated_dependency_file}"
${CCBIN}
${nvcc_flags}
${nvcc_host_compiler_flags}
${depends_CUDA_NVCC_FLAGS}
-DNVCC
${CUDA_NVCC_INCLUDE_ARGS} ${CUDA_NVCC_INCLUDE_ARGS}
) )
@ -223,12 +223,12 @@ cuda_execute_process(
"Generating ${generated_file}" "Generating ${generated_file}"
COMMAND "${CUDA_NVCC_EXECUTABLE}" COMMAND "${CUDA_NVCC_EXECUTABLE}"
"${source_file}" "${source_file}"
${CUDA_NVCC_FLAGS}
${nvcc_flags}
${CCBIN}
${nvcc_host_compiler_flags}
-DNVCC
${format_flag} -o "${generated_file}" ${format_flag} -o "${generated_file}"
${CCBIN}
${nvcc_flags}
${nvcc_host_compiler_flags}
${CUDA_NVCC_FLAGS}
-DNVCC
${CUDA_NVCC_INCLUDE_ARGS} ${CUDA_NVCC_INCLUDE_ARGS}
) )