From 129f315f7c0b204640010b20196da2afc9cb4c87 Mon Sep 17 00:00:00 2001 From: Denis Zaryaev Date: Sun, 11 Aug 2013 21:05:30 +0300 Subject: [PATCH 1/2] bugfix for OpenCL detection with Intel OpenCL SDK 1.2 on linux (Bug #3140) --- cmake/OpenCVDetectOpenCL.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/OpenCVDetectOpenCL.cmake b/cmake/OpenCVDetectOpenCL.cmake index 2c96274a8c..34e0ebc0f5 100644 --- a/cmake/OpenCVDetectOpenCL.cmake +++ b/cmake/OpenCVDetectOpenCL.cmake @@ -20,10 +20,14 @@ else(APPLE) DOC "OpenCL include directory" NO_DEFAULT_PATH) - if (X86_64) + if (X86_64 AND WIN32) set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64) - elseif (X86) + elseif (X86 AND WIN32) set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win32 lib/x86) + elseif (X86_64 AND UNIX) + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib64 lib) + elseif (X86 AND UNIX) + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib32 lib) endif() find_library(OPENCL_LIBRARY From f4010cef29671f39457c3a3261acc47635aa9b44 Mon Sep 17 00:00:00 2001 From: Denis Zaryaev Date: Mon, 12 Aug 2013 18:25:01 +0300 Subject: [PATCH 2/2] properly set OpenCL lib search path --- cmake/OpenCVDetectOpenCL.cmake | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/cmake/OpenCVDetectOpenCL.cmake b/cmake/OpenCVDetectOpenCL.cmake index 34e0ebc0f5..c96df82e2b 100644 --- a/cmake/OpenCVDetectOpenCL.cmake +++ b/cmake/OpenCVDetectOpenCL.cmake @@ -20,14 +20,24 @@ else(APPLE) DOC "OpenCL include directory" NO_DEFAULT_PATH) - if (X86_64 AND WIN32) - set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64) - elseif (X86 AND WIN32) - set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win32 lib/x86) - elseif (X86_64 AND UNIX) - set(OPENCL_POSSIBLE_LIB_SUFFIXES lib64 lib) - elseif (X86 AND UNIX) - set(OPENCL_POSSIBLE_LIB_SUFFIXES lib32 lib) + if(WIN32) + if(X86_64) + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64) + elseif(X86) + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win32 lib/x86) + else() + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib) + endif() + elseif(UNIX) + if(X86_64) + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib64 lib) + elseif(X86) + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib32 lib) + else() + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib) + endif() + else() + set(OPENCL_POSSIBLE_LIB_SUFFIXES lib) endif() find_library(OPENCL_LIBRARY