Skip to content

O
opencv
Commit 6a1e549f authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #7217 from thiell:master

parents 0d3b6465 33359639
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
cmake/OpenCVDetectCUDA.cmake
View file @ 6a1e549f
...@@ -65,7 +65,7 @@ if(CUDA_FOUND) ...@@ -65,7 +65,7 @@ if(CUDA_FOUND)
if(CUDA_GENERATION STREQUAL "Fermi") if(CUDA_GENERATION STREQUAL "Fermi")
set(__cuda_arch_bin "2.0") set(__cuda_arch_bin "2.0")
elseif(CUDA_GENERATION STREQUAL "Kepler") elseif(CUDA_GENERATION STREQUAL "Kepler")
set(__cuda_arch_bin "3.0 3.5") set(__cuda_arch_bin "3.0 3.5 3.7")
elseif(CUDA_GENERATION STREQUAL "Maxwell") elseif(CUDA_GENERATION STREQUAL "Maxwell")
set(__cuda_arch_bin "5.0") set(__cuda_arch_bin "5.0")
elseif(CUDA_GENERATION STREQUAL "Pascal") elseif(CUDA_GENERATION STREQUAL "Pascal")
...@@ -92,9 +92,9 @@ if(CUDA_FOUND) ...@@ -92,9 +92,9 @@ if(CUDA_FOUND)
set(__cuda_arch_ptx "") set(__cuda_arch_ptx "")
else() else()
if(${CUDA_VERSION} VERSION_LESS "8.0") if(${CUDA_VERSION} VERSION_LESS "8.0")
set(__cuda_arch_bin "2.0 3.0 3.5 5.0") set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0")
else() else()
set(__cuda_arch_bin "2.0 3.0 3.5 5.0 6.0") set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 6.0")
endif() endif()
set(__cuda_arch_ptx "") set(__cuda_arch_ptx "")
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment