generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #858 from apavlenko:fix_ocl_build_on_bb

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-04-30 11:25:30 +04:00
committed by OpenCV Buildbot
parent 5ce4e3c265 108bb811c5
commit f21e99de0f
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/OpenCVDetectOpenCL.cmake
View File

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