Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
39630e07
Unverified
Commit
39630e07
authored
Apr 11, 2019
by
Alexander Alekhin
Committed by
GitHub
Apr 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge pull request #14294 from alalek:issue_14286
cmake: fix WITH_OPENCL_D3D11_NV check
parent
7621b917
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
OpenCVDetectDirectX.cmake
cmake/OpenCVDetectDirectX.cmake
+5
-0
OpenCVDetectOpenCL.cmake
cmake/OpenCVDetectOpenCL.cmake
+3
-4
No files found.
cmake/OpenCVDetectDirectX.cmake
View file @
39630e07
...
@@ -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
()
cmake/OpenCVDetectOpenCL.cmake
View file @
39630e07
...
@@ -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
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment