Merge pull request #1663 from vpisarev:ocl_experiments3

2013-10-29 11:14:15 +04:00
parent 31f0ab6c80 485d36d3c0
commit 616db74e49
25 changed files with 5654 additions and 443 deletions
--- a/cmake/OpenCVDetectPython.cmake
+++ b/cmake/OpenCVDetectPython.cmake
@@ -12,7 +12,10 @@ if(WIN32 AND NOT PYTHON_EXECUTABLE)
    )
  endforeach()
 endif()
+find_host_package(PythonInterp 2.7)
+if(NOT PYTHONINTERP_FOUND)
 find_host_package(PythonInterp "${MIN_VER_PYTHON}")
+endif()

 unset(HAVE_SPHINX CACHE)