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

fix for bug #2985:

Browse Source 
OPENCLAMDBLAS and OPENCLAMDFFT never detected under linux.
lib64/import and lib32/import is the path on Windows but not Linux.
for CLAMDBLAS library we should use CLAMDBLAS_PATH (not CLAMDFFT_PATH)
This commit is contained in:
Vladislav Vinogradov 2013-06-13 16:13:46 +04:00
parent 98f6a4a615
commit 055137582c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/OpenCVDetectOpenCL.cmake
View File

@ -44,12 +44,18 @@ if(OPENCL_FOUND)
set(OPENCL_INCLUDE_DIRS ${OPENCL_INCLUDE_DIR}) set(OPENCL_INCLUDE_DIRS ${OPENCL_INCLUDE_DIR})
set(OPENCL_LIBRARIES ${OPENCL_LIBRARY}) set(OPENCL_LIBRARIES ${OPENCL_LIBRARY})
if (X86_64) if(WIN64)
set(CLAMD_POSSIBLE_LIB_SUFFIXES lib64/import) set(CLAMD_POSSIBLE_LIB_SUFFIXES lib64/import)
elseif (X86) elseif(WIN32)
set(CLAMD_POSSIBLE_LIB_SUFFIXES lib32/import) set(CLAMD_POSSIBLE_LIB_SUFFIXES lib32/import)
endif() endif()
if(X86_64 AND UNIX)
set(CLAMD_POSSIBLE_LIB_SUFFIXES lib64)
elseif(X86 AND UNIX)
set(CLAMD_POSSIBLE_LIB_SUFFIXES lib32)
endif()
if(WITH_OPENCLAMDFFT) if(WITH_OPENCLAMDFFT)
find_path(CLAMDFFT_ROOT_DIR find_path(CLAMDFFT_ROOT_DIR
NAMES include/clAmdFft.h NAMES include/clAmdFft.h
@ -80,7 +86,7 @@ if(OPENCL_FOUND)
if(WITH_OPENCLAMDBLAS) if(WITH_OPENCLAMDBLAS)
find_path(CLAMDBLAS_ROOT_DIR find_path(CLAMDBLAS_ROOT_DIR
NAMES include/clAmdBlas.h NAMES include/clAmdBlas.h
PATHS ENV CLAMDFFT_PATH ENV ProgramFiles PATHS ENV CLAMDBLAS_PATH ENV ProgramFiles
PATH_SUFFIXES clAmdBlas AMD/clAmdBlas PATH_SUFFIXES clAmdBlas AMD/clAmdBlas
DOC "AMD FFT root directory" DOC "AMD FFT root directory"
NO_DEFAULT_PATH) NO_DEFAULT_PATH)