Merge pull request #1665 from SpecLad:cuda-min-ver

11 years ago · e384a7bb95
parent 6640846e95 49c6533227
commit e384a7bb95
2 changed files with 2 additions and 1 deletions
--- a/cmake/OpenCVDetectCUDA.cmake
+++ b/cmake/OpenCVDetectCUDA.cmake
@ -8,7 +8,7 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Cl
  return()
 endif()

-find_package(CUDA 4.2 QUIET)
+find_package(CUDA "${MIN_VER_CUDA}" QUIET)

 if(CUDA_FOUND)
  set(HAVE_CUDA 1)
--- a/cmake/OpenCVMinDepVersions.cmake
+++ b/cmake/OpenCVMinDepVersions.cmake
@ -1,3 +1,4 @@
 set(MIN_VER_CMAKE 2.8.7)
+set(MIN_VER_CUDA 4.2)
 set(MIN_VER_PYTHON 2.6)
 set(MIN_VER_ZLIB 1.2.3)