summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bigler <jbigler@nvidia.com>2010-01-08 17:14:21 (GMT)
committerJames Bigler <jbigler@nvidia.com>2010-01-08 17:14:21 (GMT)
commit2316e04d1388cf9460172c41b1db35d6404ee775 (patch)
tree5f8a3a783ed83c277cf8489648dacb4852a021fe
parentd3034f9b561ab4a4d5cb4bc515d31d4770f192a8 (diff)
downloadCMake-2316e04d1388cf9460172c41b1db35d6404ee775.zip
CMake-2316e04d1388cf9460172c41b1db35d6404ee775.tar.gz
CMake-2316e04d1388cf9460172c41b1db35d6404ee775.tar.bz2
Reordered the arguments, so that user generated arguments go last and thus get precedence.
-rw-r--r--Modules/FindCUDA/run_nvcc.cmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/Modules/FindCUDA/run_nvcc.cmake b/Modules/FindCUDA/run_nvcc.cmake
index d7fde75..31bd74e 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}
)