[Cmake-commits] [cmake-commits] bigler committed run_nvcc.cmake 1.7 1.8

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/FindCUDA
In directory public:/mounts/ram/cvs-serv26066/Modules/FindCUDA

Modified Files:
	run_nvcc.cmake 
Log Message:
Reordered the arguments, so that user generated arguments go last and thus get precedence.


Index: run_nvcc.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCUDA/run_nvcc.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** run_nvcc.cmake	30 Nov 2009 22:05:18 -0000	1.7
--- run_nvcc.cmake	8 Jan 2010 17:14:21 -0000	1.8
***************
*** 169,180 ****
    "Generating dependency file: ${NVCC_generated_dependency_file}"
    COMMAND "${CUDA_NVCC_EXECUTABLE}"
    "${source_file}"
!   ${depends_CUDA_NVCC_FLAGS}
!   ${nvcc_flags}
    ${CCBIN}
    ${nvcc_host_compiler_flags}
    -DNVCC
-   -M
-   -o "${NVCC_generated_dependency_file}"
    ${CUDA_NVCC_INCLUDE_ARGS}
    )
--- 169,180 ----
    "Generating dependency file: ${NVCC_generated_dependency_file}"
    COMMAND "${CUDA_NVCC_EXECUTABLE}"
+   -M
    "${source_file}"
!   -o "${NVCC_generated_dependency_file}"
    ${CCBIN}
+   ${nvcc_flags}
    ${nvcc_host_compiler_flags}
+   ${depends_CUDA_NVCC_FLAGS}
    -DNVCC
    ${CUDA_NVCC_INCLUDE_ARGS}
    )
***************
*** 224,233 ****
    COMMAND "${CUDA_NVCC_EXECUTABLE}"
    "${source_file}"
!   ${CUDA_NVCC_FLAGS}
!   ${nvcc_flags}
    ${CCBIN}
    ${nvcc_host_compiler_flags}
    -DNVCC
-   ${format_flag} -o "${generated_file}"
    ${CUDA_NVCC_INCLUDE_ARGS}
    )
--- 224,233 ----
    COMMAND "${CUDA_NVCC_EXECUTABLE}"
    "${source_file}"
!   ${format_flag} -o "${generated_file}"
    ${CCBIN}
+   ${nvcc_flags}
    ${nvcc_host_compiler_flags}
+   ${CUDA_NVCC_FLAGS}
    -DNVCC
    ${CUDA_NVCC_INCLUDE_ARGS}
    )