Merge pull request #858 from apavlenko:fix_ocl_build_on_bb

f21e99de · Andrey Pavlenko · OpenCV Buildbot · 5ce4e3c2 · 108bb811 · f21e99de
Commit f21e99de authored Apr 30, 2013 by Andrey Pavlenko Committed by OpenCV Buildbot Apr 30, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

OpenCVDetectOpenCL.cmake cmake/OpenCVDetectOpenCL.cmake +4 -2

No files found.
--- a/cmake/OpenCVDetectOpenCL.cmake
+++ b/cmake/OpenCVDetectOpenCL.cmake
@@ -17,7 +17,8 @@ else(APPLE)
              NAMES OpenCL/cl.h CL/cl.h
              HINTS ${OPENCL_ROOT_DIR}
              PATH_SUFFIXES include include/nvidia-current
-              DOC "OpenCL include directory")
+              DOC "OpenCL include directory"
+              NO_DEFAULT_PATH)

    if (X86_64)
      set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
@@ -29,7 +30,8 @@ else(APPLE)
              NAMES OpenCL
              HINTS ${OPENCL_ROOT_DIR}
              PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
-              DOC "OpenCL library")
+              DOC "OpenCL library"
+              NO_DEFAULT_PATH)

    mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
    include(FindPackageHandleStandardArgs)