From: Vladislav Vinogradov Date: Wed, 30 Oct 2013 06:21:13 +0000 (+0400) Subject: fixed CC arch/pts for android (used sm_32) X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~738^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20641b4a0b7200a5b6b7f6ab9a0c87c3f582a4f9;p=platform%2Fupstream%2Fopencv.git fixed CC arch/pts for android (used sm_32) --- diff --git a/cmake/OpenCVDetectCUDA.cmake b/cmake/OpenCVDetectCUDA.cmake index 156d90e..0b61f14 100644 --- a/cmake/OpenCVDetectCUDA.cmake +++ b/cmake/OpenCVDetectCUDA.cmake @@ -90,12 +90,17 @@ if(CUDA_FOUND) endif() if(NOT DEFINED __cuda_arch_bin) - 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") + if(ANDROID) + set(__cuda_arch_bin "3.2") + set(__cuda_arch_ptx "") else() - set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0 3.5") + 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") + else() + set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0 3.5") + endif() + set(__cuda_arch_ptx "3.0") endif() - set(__cuda_arch_ptx "3.0") endif() set(CUDA_ARCH_BIN ${__cuda_arch_bin} CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported")