Merge pull request #1664 from SpecLad:merge-2.4

2013-10-24 17:27:21 +04:00
parent e384a7bb95 dfe07df87b
commit 7e1ded0ebd
159 changed files with 26646 additions and 9202 deletions
--- a/cmake/OpenCVDetectCUDA.cmake
+++ b/cmake/OpenCVDetectCUDA.cmake
@@ -108,6 +108,7 @@ if(CUDA_FOUND)
      message(STATUS "Automatic detection of CUDA generation failed. Going to build for all known architectures.")
    else()
      set(__cuda_arch_bin "${_nvcc_out}")
+      string(REPLACE "2.1" "2.1(2.0)" __cuda_arch_bin "${__cuda_arch_bin}")
    endif()
  endif()