Merge pull request #3603 from alalek:ocl_svm

2015-01-29 05:35:46 +00:00
parent bdebf4cea7 0a07d780e0
commit 97aa8d3341
15 changed files with 1544 additions and 162 deletions
--- a/cmake/OpenCVDetectOpenCL.cmake
+++ b/cmake/OpenCVDetectOpenCL.cmake
@@ -26,6 +26,10 @@ if(OPENCL_FOUND)

  set(HAVE_OPENCL 1)

+  if(WITH_OPENCL_SVM)
+    set(HAVE_OPENCL_SVM 1)
+  endif()
+
  if(HAVE_OPENCL_STATIC)
    set(OPENCL_LIBRARIES "${OPENCL_LIBRARY}")
  else()
--- a/cmake/templates/cvconfig.h.in
+++ b/cmake/templates/cvconfig.h.in
@@ -122,6 +122,7 @@
 /* OpenCL Support */
 #cmakedefine HAVE_OPENCL
 #cmakedefine HAVE_OPENCL_STATIC
+#cmakedefine HAVE_OPENCL_SVM

 /* OpenEXR codec */
 #cmakedefine HAVE_OPENEXR