Merge pull request #7217 from thiell:master

This commit is contained in:
Vadim Pisarevsky 2016-09-14 12:08:45 +00:00
commit 6a1e549ffe

View File

@ -65,7 +65,7 @@ if(CUDA_FOUND)
if(CUDA_GENERATION STREQUAL "Fermi")
set(__cuda_arch_bin "2.0")
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")
set(__cuda_arch_bin "5.0")
elseif(CUDA_GENERATION STREQUAL "Pascal")
@ -92,9 +92,9 @@ if(CUDA_FOUND)
set(__cuda_arch_ptx "")
else()
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()
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()
set(__cuda_arch_ptx "")
endif()