Merge pull request opencv#14294 from alalek:issue_14286

cmake: fix WITH_OPENCL_D3D11_NV check
chrisnicollo · Apr 11, 2019 · 39630e0 · 39630e0
1 parent 7621b91
commit 39630e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cmake/OpenCVDetectDirectX.cmake b/cmake/OpenCVDetectDirectX.cmake
@@ -22,4 +22,9 @@ if(WIN32)
   set(HAVE_D3D11 ON)
   set(HAVE_D3D10 ON)
   set(HAVE_D3D9 ON)
+
+  if(HAVE_OPENCL AND WITH_OPENCL_D3D11_NV AND EXISTS "${OPENCL_INCLUDE_DIR}/CL/cl_d3d11_ext.h")
+    set(HAVE_OPENCL_D3D11_NV ON)
+  endif()
+
 endif()
diff --git a/cmake/OpenCVDetectOpenCL.cmake b/cmake/OpenCVDetectOpenCL.cmake
@@ -11,10 +11,6 @@ mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
 
 if(OPENCL_FOUND)
 
-  if(WITH_OPENCL_D3D11_NV AND EXISTS "${OPENCL_INCLUDE_DIR}/CL/cl_d3d11_ext.h")
-    set(HAVE_OPENCL_D3D11_NV ON)
-  endif()
-
   if(OPENCL_LIBRARY)
     set(HAVE_OPENCL_STATIC ON)
     set(OPENCL_LIBRARIES "${OPENCL_LIBRARY}")
@@ -82,4 +78,7 @@ if(OPENCL_FOUND)
       list(APPEND OPENCL_INCLUDE_DIRS "${CLAMDBLAS_INCLUDE_DIR}")
     endif()
   endif()
+
+  # check WITH_OPENCL_D3D11_NV is located in OpenCVDetectDirectX.cmake file
+
 endif()