Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/scalfmm/scalfmm

CMakeLists.txt

@@ -410,6 +410,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
         if (CUDA_LIBRARIES)
             set(SCALFMM_LIBRARIES "${SCALFMM_LIBRARIES}; ${CUDA_LIBRARIES}")
         endif()
+        
+        set(CUDA_NEEDED_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/Src)
     endif()
 
     # Find StarPU with a list of optional components

Src/CMakeLists.txt

@@ -32,7 +32,7 @@ if(ScalFMM_USE_CUDA)
         ADD_CUSTOM_COMMAND(OUTPUT  ${_filehpp_output}
                   DEPENDS ${_file}
                   COMMAND echo ARGS Compiling ${_filewe}
-                  COMMAND nvcc ARGS -c ${_file} -o ${_filehpp_output} ${CUSTOM_CUDA_FLAGS})
+                  COMMAND nvcc ARGS -I${CUDA_NEEDED_INCLUDE_DIRS} -c ${_file} -o ${_filehpp_output} ${CUSTOM_CUDA_FLAGS})
  
         LIST (APPEND SCALFMM_CUDA_SOURCES ${_filehpp_output})
     ENDFOREACH ()