Merge pull request #3886 from beahacker:2.4

d948b2a2 · Vadim Pisarevsky · 83d6d70a · ebd7d084 · d948b2a2
Commit d948b2a2 authored Mar 30, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

OpenCVDetectCUDA.cmake cmake/OpenCVDetectCUDA.cmake +2 -0

No files found.
--- a/cmake/OpenCVDetectCUDA.cmake
+++ b/cmake/OpenCVDetectCUDA.cmake
@@ -92,6 +92,8 @@ if(CUDA_FOUND)
    else()
      if(${CUDA_VERSION} VERSION_LESS "5.0")
        set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0")
+      elseif(${CUDA_VERSION} VERSION_GREATER "6.5")
+        set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5")
      else()
        set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0 3.5")
      endif()