From 108bb811c560afc4b40f749a643d4e59671371d5 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Mon, 29 Apr 2013 23:10:03 +0400 Subject: [PATCH] fixing precommit build on ubuntu-64 (now it takes OCL headers from non-default OCL SDK, but libs from default one) --- cmake/OpenCVDetectOpenCL.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVDetectOpenCL.cmake b/cmake/OpenCVDetectOpenCL.cmake index 970632151a..014066bc7e 100644 --- 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)