From 2316e04d1388cf9460172c41b1db35d6404ee775 Mon Sep 17 00:00:00 2001 From: James Bigler Date: Fri, 8 Jan 2010 12:14:21 -0500 Subject: Reordered the arguments, so that user generated arguments go last and thus get precedence. --- Modules/FindCUDA/run_nvcc.cmake | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Modules/FindCUDA') diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake index d7fde752d1..31bd74efc0 100644 --- a/Modules/FindCUDA/run_nvcc.cmake +++ b/Modules/FindCUDA/run_nvcc.cmake @@ -168,14 +168,14 @@ endif() cuda_execute_process( "Generating dependency file: ${NVCC_generated_dependency_file}" COMMAND "${CUDA_NVCC_EXECUTABLE}" + -M "${source_file}" - ${depends_CUDA_NVCC_FLAGS} - ${nvcc_flags} + -o "${NVCC_generated_dependency_file}" ${CCBIN} + ${nvcc_flags} ${nvcc_host_compiler_flags} + ${depends_CUDA_NVCC_FLAGS} -DNVCC - -M - -o "${NVCC_generated_dependency_file}" ${CUDA_NVCC_INCLUDE_ARGS} ) @@ -223,12 +223,12 @@ cuda_execute_process( "Generating ${generated_file}" COMMAND "${CUDA_NVCC_EXECUTABLE}" "${source_file}" - ${CUDA_NVCC_FLAGS} - ${nvcc_flags} + ${format_flag} -o "${generated_file}" ${CCBIN} + ${nvcc_flags} ${nvcc_host_compiler_flags} + ${CUDA_NVCC_FLAGS} -DNVCC - ${format_flag} -o "${generated_file}" ${CUDA_NVCC_INCLUDE_ARGS} ) -- cgit v1.2.1