kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindOpenCL-fix-ENV' 

d4295539 FindOpenCL: Added missing ENV for each environment variable reference
This commit is contained in:
Brad King 2014-06-23 10:27:58 -04:00 committed by CMake Topic Stage
parent fc6fdc9b0b d429553976
commit 0474aa4a78
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Modules/FindOpenCL.cmake
View File

@ -70,14 +70,15 @@ endfunction()
find_path(OpenCL_INCLUDE_DIR find_path(OpenCL_INCLUDE_DIR
NAMES NAMES
CL/cl.h OpenCL/cl.h CL/cl.h OpenCL/cl.h
PATHS ENV PATHS
"PROGRAMFILES(X86)" ENV "PROGRAMFILES(X86)"
AMDAPPSDKROOT ENV AMDAPPSDKROOT
INTELOCLSDKROOT ENV INTELOCLSDKROOT
NVSDKCOMPUTE_ROOT ENV NVSDKCOMPUTE_ROOT
CUDA_PATH ENV CUDA_PATH
ATISTREAMSDKROOT ENV ATISTREAMSDKROOT
PATH_SUFFIXES PATH_SUFFIXES
include
OpenCL/common/inc OpenCL/common/inc
"AMD APP/include") "AMD APP/include")
@ -87,13 +88,13 @@ if(WIN32)
if(CMAKE_SIZEOF_VOID_P EQUAL 4) if(CMAKE_SIZEOF_VOID_P EQUAL 4)
find_library(OpenCL_LIBRARY find_library(OpenCL_LIBRARY
NAMES OpenCL NAMES OpenCL
PATHS ENV PATHS
"PROGRAMFILES(X86)" ENV "PROGRAMFILES(X86)"
AMDAPPSDKROOT ENV AMDAPPSDKROOT
INTELOCLSDKROOT ENV INTELOCLSDKROOT
CUDA_PATH ENV CUDA_PATH
NVSDKCOMPUTE_ROOT ENV NVSDKCOMPUTE_ROOT
ATISTREAMSDKROOT ENV ATISTREAMSDKROOT
PATH_SUFFIXES PATH_SUFFIXES
"AMD APP/lib/x86" "AMD APP/lib/x86"
lib/x86 lib/x86
@ -102,13 +103,13 @@ if(WIN32)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
find_library(OpenCL_LIBRARY find_library(OpenCL_LIBRARY
NAMES OpenCL NAMES OpenCL
PATHS ENV PATHS
"PROGRAMFILES(X86)" ENV "PROGRAMFILES(X86)"
AMDAPPSDKROOT ENV AMDAPPSDKROOT
INTELOCLSDKROOT ENV INTELOCLSDKROOT
CUDA_PATH ENV CUDA_PATH
NVSDKCOMPUTE_ROOT ENV NVSDKCOMPUTE_ROOT
ATISTREAMSDKROOT ENV ATISTREAMSDKROOT
PATH_SUFFIXES PATH_SUFFIXES
"AMD APP/lib/x86_64" "AMD APP/lib/x86_64"
lib/x86_64 lib/x86_64