diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-23 14:27:58 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-23 14:27:58 (GMT) |
| commit | 0474aa4a78d74f971f6be5d3c4209c46bd6e02e9 (patch) | |
| tree | 2449fba4f64c77cf4e8f55318fcb951396c8112a | |
| parent | fc6fdc9b0b176bdbd69977117580c89c0fbe3d9f (diff) | |
| parent | d4295539767d8850e3d75a64a863d438f275e185 (diff) | |
| download | CMake-0474aa4a78d74f971f6be5d3c4209c46bd6e02e9.zip CMake-0474aa4a78d74f971f6be5d3c4209c46bd6e02e9.tar.gz CMake-0474aa4a78d74f971f6be5d3c4209c46bd6e02e9.tar.bz2 | |
Merge topic 'FindOpenCL-fix-ENV'
d4295539 FindOpenCL: Added missing ENV for each environment variable reference
| -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 |