[Cmake-commits] [cmake-commits] king committed run_nvcc.cmake 1.2.2.3 1.2.2.4

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-8
	run_nvcc.cmake 
Log Message:
CMake 2.8.1-rc2


Index: run_nvcc.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindCUDA/run_nvcc.cmake,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C 2 -d -r1.2.2.3 -r1.2.2.4
*** run_nvcc.cmake	28 Jan 2010 21:47:43 -0000	1.2.2.3
--- run_nvcc.cmake	11 Feb 2010 15:50:41 -0000	1.2.2.4
***************
*** 165,168 ****
--- 165,174 ----
  endif()
  
+ # nvcc doesn't define __CUDACC__ for some reason when generating dependency files.  This
+ # can cause incorrect dependencies when #including files based on this macro which is
+ # defined in the generating passes of nvcc invokation.  We will go ahead and manually
+ # define this for now until a future version fixes this bug.
+ set(CUDACC_DEFINE -D__CUDACC__)
+ 
  # Generate the dependency file
  cuda_execute_process(
***************
*** 170,173 ****
--- 176,180 ----
    COMMAND "${CUDA_NVCC_EXECUTABLE}"
    -M
+   ${CUDACC_DEFINE}
    "${source_file}"
    -o "${NVCC_generated_dependency_file}"