summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-12-07 13:13:28 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-12-07 13:13:37 (GMT)
commit79fde6a324545f6461020c957af1f63e5f2a72da (patch)
treeba4000ffd1c44b96c1d122d7f1c90eff948ce87b
parent3de52db69cc0c9568067c02492eddf5396147e0c (diff)
parentf313541adb677f754953d1598d3e8b234ad975b2 (diff)
downloadCMake-79fde6a324545f6461020c957af1f63e5f2a72da.zip
CMake-79fde6a324545f6461020c957af1f63e5f2a72da.tar.gz
CMake-79fde6a324545f6461020c957af1f63e5f2a72da.tar.bz2
Merge topic 'FindOpenCL-amd-sdk'
f313541a FindOpenCL: Add support for AMD OpenCL SDK Light Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1562
-rw-r--r--Modules/FindOpenCL.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindOpenCL.cmake b/Modules/FindOpenCL.cmake
index 5d79110..297a5fb 100644
--- a/Modules/FindOpenCL.cmake
+++ b/Modules/FindOpenCL.cmake
@@ -76,6 +76,7 @@ find_path(OpenCL_INCLUDE_DIR
ENV NVSDKCOMPUTE_ROOT
ENV CUDA_PATH
ENV ATISTREAMSDKROOT
+ ENV OCL_ROOT
PATH_SUFFIXES
include
OpenCL/common/inc
@@ -94,6 +95,7 @@ if(WIN32)
ENV CUDA_PATH
ENV NVSDKCOMPUTE_ROOT
ENV ATISTREAMSDKROOT
+ ENV OCL_ROOT
PATH_SUFFIXES
"AMD APP/lib/x86"
lib/x86
@@ -109,6 +111,7 @@ if(WIN32)
ENV CUDA_PATH
ENV NVSDKCOMPUTE_ROOT
ENV ATISTREAMSDKROOT
+ ENV OCL_ROOT
PATH_SUFFIXES
"AMD APP/lib/x86_64"
lib/x86_64