Merge pull request #6592 from guysoft:fix_6500_fix2

eca75236 · Maksim Shabunin · 45474279 · 0a48b9ae · eca75236
Commit eca75236 authored May 26, 2016 by Maksim Shabunin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

OpenCVDetectCUDA.cmake cmake/OpenCVDetectCUDA.cmake +1 -0

No files found.
--- a/cmake/OpenCVDetectCUDA.cmake
+++ b/cmake/OpenCVDetectCUDA.cmake
@@ -138,6 +138,7 @@ if(CUDA_FOUND)
      set(OPENCV_CUDA_ARCH_FEATURES "${OPENCV_CUDA_ARCH_FEATURES} ${ARCH}")
    endif()
  endforeach()
+  set(NVCC_FLAGS_EXTRA ${NVCC_FLAGS_EXTRA} -D_FORCE_INLINES)

  # Tell NVCC to add PTX intermediate code for the specified architectures
  string(REGEX MATCHALL "[0-9]+" ARCH_LIST "${ARCH_PTX_NO_POINTS}")