浏览代码

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

James Bigler 16 年之前
父节点
当前提交
2316e04d13
共有 1 个文件被更改,包括 7 次插入7 次删除
  1. 7 7
      Modules/FindCUDA/run_nvcc.cmake

+ 7 - 7
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}
   )