Skip to content

O
opencv
Commit f21e99de authored by Andrey Pavlenko's avatar Andrey Pavlenko Committed by OpenCV Buildbot
Browse files
Options

Merge pull request #858 from apavlenko:fix_ocl_build_on_bb

parents 5ce4e3c2 108bb811
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
cmake/OpenCVDetectOpenCL.cmake
View file @ f21e99de
...@@ -17,7 +17,8 @@ else(APPLE) ...@@ -17,7 +17,8 @@ else(APPLE)
NAMES OpenCL/cl.h CL/cl.h NAMES OpenCL/cl.h CL/cl.h
HINTS ${OPENCL_ROOT_DIR} HINTS ${OPENCL_ROOT_DIR}
PATH_SUFFIXES include include/nvidia-current PATH_SUFFIXES include include/nvidia-current
DOC "OpenCL include directory") DOC "OpenCL include directory"
NO_DEFAULT_PATH)
if (X86_64) if (X86_64)
set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64) set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
...@@ -29,7 +30,8 @@ else(APPLE) ...@@ -29,7 +30,8 @@ else(APPLE)
NAMES OpenCL NAMES OpenCL
HINTS ${OPENCL_ROOT_DIR} HINTS ${OPENCL_ROOT_DIR}
PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES} PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
DOC "OpenCL library") DOC "OpenCL library"
NO_DEFAULT_PATH)
mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY) mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
......
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