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