Unverified Commit 39630e07 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub

Merge pull request #14294 from alalek:issue_14286

cmake: fix WITH_OPENCL_D3D11_NV check
parent 7621b917
...@@ -22,4 +22,9 @@ if(WIN32) ...@@ -22,4 +22,9 @@ if(WIN32)
set(HAVE_D3D11 ON) set(HAVE_D3D11 ON)
set(HAVE_D3D10 ON) set(HAVE_D3D10 ON)
set(HAVE_D3D9 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() endif()
...@@ -11,10 +11,6 @@ mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY) ...@@ -11,10 +11,6 @@ mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
if(OPENCL_FOUND) 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) if(OPENCL_LIBRARY)
set(HAVE_OPENCL_STATIC ON) set(HAVE_OPENCL_STATIC ON)
set(OPENCL_LIBRARIES "${OPENCL_LIBRARY}") set(OPENCL_LIBRARIES "${OPENCL_LIBRARY}")
...@@ -82,4 +78,7 @@ if(OPENCL_FOUND) ...@@ -82,4 +78,7 @@ if(OPENCL_FOUND)
list(APPEND OPENCL_INCLUDE_DIRS "${CLAMDBLAS_INCLUDE_DIR}") list(APPEND OPENCL_INCLUDE_DIRS "${CLAMDBLAS_INCLUDE_DIR}")
endif() endif()
endif() endif()
# check WITH_OPENCL_D3D11_NV is located in OpenCVDetectDirectX.cmake file
endif() endif()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment