diff options
| author | Matthäus G. Chajdas <cmake@anteru.net> | 2014-06-22 08:41:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-23 14:26:52 (GMT) |
| commit | d4295539767d8850e3d75a64a863d438f275e185 (patch) | |
| tree | ba7594e3ffce3596d5311bcc951dc79e4c78cafe /Modules/FindOpenCL.cmake | |
| parent | 7c4d890da3f85fafe6350a9de57d9f42ea3a2a90 (diff) | |
| download | CMake-d4295539767d8850e3d75a64a863d438f275e185.zip CMake-d4295539767d8850e3d75a64a863d438f275e185.tar.gz CMake-d4295539767d8850e3d75a64a863d438f275e185.tar.bz2 | |
FindOpenCL: Added missing ENV for each environment variable reference
Also add an 'include' path suffix that may appear after the value of
some of the environment variables.
Diffstat (limited to 'Modules/FindOpenCL.cmake')
| -rw-r--r-- | Modules/FindOpenCL.cmake | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake index b5eed9a..4d3ed84 100644 --- a/Modules/FindOpenCL.cmake +++ b/Modules/FindOpenCL.cmake @@ -70,14 +70,15 @@ endfunction() find_path(OpenCL_INCLUDE_DIR NAMES CL/cl.h OpenCL/cl.h - PATHS ENV - "PROGRAMFILES(X86)" - AMDAPPSDKROOT - INTELOCLSDKROOT - NVSDKCOMPUTE_ROOT - CUDA_PATH - ATISTREAMSDKROOT + PATHS + ENV "PROGRAMFILES(X86)" + ENV AMDAPPSDKROOT + ENV INTELOCLSDKROOT + ENV NVSDKCOMPUTE_ROOT + ENV CUDA_PATH + ENV ATISTREAMSDKROOT PATH_SUFFIXES + include OpenCL/common/inc "AMD APP/include") @@ -87,13 +88,13 @@ if(WIN32) if(CMAKE_SIZEOF_VOID_P EQUAL 4) find_library(OpenCL_LIBRARY NAMES OpenCL - PATHS ENV - "PROGRAMFILES(X86)" - AMDAPPSDKROOT - INTELOCLSDKROOT - CUDA_PATH - NVSDKCOMPUTE_ROOT - ATISTREAMSDKROOT + PATHS + ENV "PROGRAMFILES(X86)" + ENV AMDAPPSDKROOT + ENV INTELOCLSDKROOT + ENV CUDA_PATH + ENV NVSDKCOMPUTE_ROOT + ENV ATISTREAMSDKROOT PATH_SUFFIXES "AMD APP/lib/x86" lib/x86 @@ -102,13 +103,13 @@ if(WIN32) elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) find_library(OpenCL_LIBRARY NAMES OpenCL - PATHS ENV - "PROGRAMFILES(X86)" - AMDAPPSDKROOT - INTELOCLSDKROOT - CUDA_PATH - NVSDKCOMPUTE_ROOT - ATISTREAMSDKROOT + PATHS + ENV "PROGRAMFILES(X86)" + ENV AMDAPPSDKROOT + ENV INTELOCLSDKROOT + ENV CUDA_PATH + ENV NVSDKCOMPUTE_ROOT + ENV ATISTREAMSDKROOT PATH_SUFFIXES "AMD APP/lib/x86_64" lib/x86_64 |