From 0f5692d1ea1ce4c6acfb1c0da6b38925920e2eaf Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Sat, 11 Oct 2008 06:43:57 +0000
Subject: [PATCH] Compile CUDA files as C++.

---
 cmake/FindCUDA.cmake | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/cmake/FindCUDA.cmake b/cmake/FindCUDA.cmake
index e3989b5..f7eb332 100644
--- a/cmake/FindCUDA.cmake
+++ b/cmake/FindCUDA.cmake
@@ -57,7 +57,7 @@ MARK_AS_ADVANCED (CUDA_FOUND CUDA_COMPILER CUDA_RUNTIME_LIBRARY)
 
 
 #SET(CUDA_OPTIONS "-ncfe")
-SET(CUDA_OPTIONS "")
+SET(CUDA_OPTIONS "--host-compilation=C++")
 
 IF (CUDA_EMULATION)
 	SET (CUDA_OPTIONS "${CUDA_OPTIONS} -deviceemu")
@@ -90,18 +90,18 @@ MACRO (GET_CUFILE_DEPENDENCIES dependencies file)
 	GET_FILENAME_COMPONENT(filepath ${file} PATH)
 	
 	#  parse file for dependencies
-	FILE(READ "${file}" CONTENTS)
-	#STRING(REGEX MATCHALL "#[ \t]*include[ \t]+[<\"][^>\"]*" DEPS "${CONTENTS}")
-	STRING(REGEX MATCHALL "#[ \t]*include[ \t]+\"[^\"]*" DEPS "${CONTENTS}")
+	FILE(READ "${file}" CONTENTS)
+	#STRING(REGEX MATCHALL "#[ \t]*include[ \t]+[<\"][^>\"]*" DEPS "${CONTENTS}")
+	STRING(REGEX MATCHALL "#[ \t]*include[ \t]+\"[^\"]*" DEPS "${CONTENTS}")
 	
 	SET(${dependencies})
 	
 	FOREACH(DEP ${DEPS})
 		STRING(REGEX REPLACE "#[ \t]*include[ \t]+\"" "" DEP "${DEP}")
-
+
 		FIND_PATH(PATH_OF_${DEP} ${DEP}
 			${filepath})
-
+
 		IF(NOT ${PATH_OF_${DEP}} STREQUAL PATH_OF_${DEP}-NOTFOUND)
 			#MESSAGE("${file} : ${PATH_OF_${DEP}}/${DEP}")
 			SET(${dependencies} ${${dependencies}} ${PATH_OF_${DEP}}/${DEP})
@@ -119,22 +119,22 @@ MACRO (WRAP_CUDA outfiles)
 
 	FOREACH (CUFILE ${ARGN})
 		GET_FILENAME_COMPONENT (CUFILE ${CUFILE} ABSOLUTE)
-		GET_FILENAME_COMPONENT (CFILE ${CUFILE} NAME_WE)
-		SET (CFILE ${CMAKE_CURRENT_BINARY_DIR}/${CFILE}.gen.c)
+		GET_FILENAME_COMPONENT (CPPFILE ${CUFILE} NAME_WE)
+		SET (CPPFILE ${CMAKE_CURRENT_BINARY_DIR}/${CPPFILE}.gen.cpp)
 
 		GET_CUFILE_DEPENDENCIES(CUDEPS ${CUFILE})
 		#MESSAGE("${CUDEPS}")
 
 		ADD_CUSTOM_COMMAND (
-			OUTPUT ${CFILE}
+			OUTPUT ${CPPFILE}
 			COMMAND ${CUDA_COMPILER}
-			ARGS -cuda ${cuda_includes} ${CUDA_OPTIONS} -o ${CFILE} ${CUFILE}
+			ARGS -cuda ${cuda_includes} ${CUDA_OPTIONS} -o ${CPPFILE} ${CUFILE}
 			MAIN_DEPENDENCY ${CUFILE}
 			DEPENDS ${CUDEPS})
 
-		#MACRO_ADD_FILE_DEPENDENCIES(${CUFILE} ${CFILE})
+		#MACRO_ADD_FILE_DEPENDENCIES(${CUFILE} ${CPPFILE})
 
-		SET (${outfiles} ${${outfiles}} ${CFILE})
+		SET (${outfiles} ${${outfiles}} ${CPPFILE})
 	ENDFOREACH (CUFILE)
 	
 	SET_SOURCE_FILES_PROPERTIES(${outfiles} PROPERTIES GENERATED 1)