cldetect.diff

Diff between 2.4.5 and 2.4.6 of OpenCVDetectOpenCL.cmake - Ray Rashif, 2013-07-09 11:09 pm

Download (2 kB)

 
OpenCVDetectOpenCL.cmake 2013-07-10 02:21:52.423406981 +0800
4 4
  set(OPENCL_INCLUDE_DIR "" CACHE STRING "OpenCL include directory")
5 5
  mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
6 6
else(APPLE)
7
  find_package(OpenCL QUIET)
7
  #find_package(OpenCL QUIET)
8 8

  
9 9
  if (NOT OPENCL_FOUND)
10 10
    find_path(OPENCL_ROOT_DIR
......
17 17
              NAMES OpenCL/cl.h CL/cl.h
18 18
              HINTS ${OPENCL_ROOT_DIR}
19 19
              PATH_SUFFIXES include include/nvidia-current
20
              DOC "OpenCL include directory")
20
              DOC "OpenCL include directory"
21
              NO_DEFAULT_PATH)
21 22

  
22 23
    if (X86_64)
23 24
      set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
......
29 30
              NAMES OpenCL
30 31
              HINTS ${OPENCL_ROOT_DIR}
31 32
              PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
32
              DOC "OpenCL library")
33
              DOC "OpenCL library"
34
              NO_DEFAULT_PATH)
33 35

  
34 36
    mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
35 37
    include(FindPackageHandleStandardArgs)
......
42 44
  set(OPENCL_INCLUDE_DIRS ${OPENCL_INCLUDE_DIR})
43 45
  set(OPENCL_LIBRARIES    ${OPENCL_LIBRARY})
44 46

  
45
  if (X86_64)
47
  if(WIN32 AND X86_64)
46 48
    set(CLAMD_POSSIBLE_LIB_SUFFIXES lib64/import)
47
  elseif (X86)
49
  elseif(WIN32)
48 50
    set(CLAMD_POSSIBLE_LIB_SUFFIXES lib32/import)
49 51
  endif()
50 52

  
53
  if(X86_64 AND UNIX)
54
    set(CLAMD_POSSIBLE_LIB_SUFFIXES lib64)
55
  elseif(X86 AND UNIX)
56
    set(CLAMD_POSSIBLE_LIB_SUFFIXES lib32)
57
  endif()
58

  
51 59
  if(WITH_OPENCLAMDFFT)
52 60
    find_path(CLAMDFFT_ROOT_DIR
53 61
              NAMES include/clAmdFft.h
......
78 86
  if(WITH_OPENCLAMDBLAS)
79 87
    find_path(CLAMDBLAS_ROOT_DIR
80 88
              NAMES include/clAmdBlas.h
81
              PATHS ENV CLAMDFFT_PATH ENV ProgramFiles
89
              PATHS ENV CLAMDBLAS_PATH ENV ProgramFiles
82 90
              PATH_SUFFIXES clAmdBlas AMD/clAmdBlas
83 91
              DOC "AMD FFT root directory"
84 92
              NO_DEFAULT_PATH)