From 215dd2a41bc8a3f2499bee4407057665ae326739 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Fri, 4 May 2012 10:24:23 +0000 Subject: [PATCH] Merged revision(s) 8304 from trunk/opencv/cmake/OpenCVDetectCUDA.cmake: Added check for CUDA toolkit version ( older can't compile Kepler ) ........ --- cmake/OpenCVDetectCUDA.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVDetectCUDA.cmake b/cmake/OpenCVDetectCUDA.cmake index 1f72f05b79..b5cb19458e 100644 --- a/cmake/OpenCVDetectCUDA.cmake +++ b/cmake/OpenCVDetectCUDA.cmake @@ -13,7 +13,12 @@ if(CUDA_FOUND) message(STATUS "CUDA detected: " ${CUDA_VERSION}) - set(CUDA_ARCH_BIN "1.1 1.2 1.3 2.0 2.1(2.0) 3.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported") + if("CUDA_VERSION_STRING" VERSION_GREATER "4.1") + set(CUDA_ARCH_BIN "1.1 1.2 1.3 2.0 2.1(2.0) 3.0" CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported") + else() + set(CUDA_ARCH_BIN "1.1 1.2 1.3 2.0 2.1(2.0)" CACHE STRING "Specify 'real' GPU architectures to build binaries for, BIN(PTX) format is supported") + endif() + set(CUDA_ARCH_PTX "2.0" CACHE STRING "Specify 'virtual' PTX architectures to build PTX intermediate code for") string(REGEX REPLACE "\\." "" ARCH_BIN_NO_POINTS "${CUDA_ARCH_BIN}") -- GitLab