mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14294 from alalek:issue_14286

Browse Source 
cmake: fix WITH_OPENCL_D3D11_NV check
This commit is contained in:
Alexander Alekhin 2019-04-11 17:50:15 +03:00 committed by GitHub
parent 7621b91769
commit 39630e076a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/OpenCVDetectDirectX.cmake
View File

@ -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()

7
cmake/OpenCVDetectOpenCL.cmake
View File

@ -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)
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()