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

e384a7bb · Roman Donchenko · OpenCV Buildbot · 6640846e · 49c65332 · e384a7bb
Commit e384a7bb authored Oct 22, 2013 by Roman Donchenko Committed by OpenCV Buildbot Oct 22, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

OpenCVDetectCUDA.cmake cmake/OpenCVDetectCUDA.cmake +1 -1

OpenCVMinDepVersions.cmake cmake/OpenCVMinDepVersions.cmake +1 -0

No files found.
--- 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
 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)