Skip to content
Snippets Groups Projects
Commit 2bba031c authored by Tony Butler's avatar Tony Butler
Browse files

Add `OCL_ROOT` envvar support for Windows OCL SDK Light autodetection and...

Add `OCL_ROOT` envvar support for Windows OCL SDK Light autodetection and prefer it over AMD APP SDK if both are installed
parent 853ade25
No related branches found
No related tags found
No related merge requests found
......@@ -13,6 +13,13 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
# help to find cuda on systems with a software module system
list(APPEND CMAKE_PREFIX_PATH "$ENV{CUDA_ROOT}")
# help to find AMD OCL SDK Light (replaced APP SDK)
list(APPEND CMAKE_PREFIX_PATH "$ENV{OCL_ROOT}")
# help to find AMD app SDK on systems with a software module system
list(APPEND CMAKE_PREFIX_PATH "$ENV{AMDAPPSDKROOT}")
# allow user to extent CMAKE_PREFIX_PATH via environment variable
list(APPEND CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH}")
......@@ -213,11 +220,6 @@ else()
add_definitions("-DCONF_NO_CUDA")
endif()
# help to find AMD app SDK on systems with a software module system
list(APPEND CMAKE_PREFIX_PATH "$ENV{AMDAPPSDKROOT}")
# allow user to extent CMAKE_PREFIX_PATH via environment variable
list(APPEND CMAKE_PREFIX_PATH "$ENV{CMAKE_PREFIX_PATH}")
###############################################################################
# Find OpenCL
###############################################################################
......@@ -231,6 +233,7 @@ if(OpenCL_ENABLE)
OpenCL/cl.h
NO_DEFAULT_PATH
PATHS
ENV "OCL_ROOT"
ENV "OpenCL_ROOT"
ENV AMDAPPSDKROOT
ENV ATISTREAMSDKROOT
......@@ -247,6 +250,7 @@ if(OpenCL_ENABLE)
OpenCL.lib
NO_DEFAULT_PATH
PATHS
ENV "OCL_ROOT"
ENV "OpenCL_ROOT"
ENV AMDAPPSDKROOT
ENV ATISTREAMSDKROOT
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment