diff options
| author | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-11 09:47:01 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:53 +0100 |
| commit | 3b72db05d6f8df28728b292c8bbd27c402dc8704 (patch) | |
| tree | f567d0a226e9d0bc4ffe2ccac6c931fa60b93674 | |
| parent | cd066ca52d661adf042f0a3122e809ca8769309c (diff) | |
| download | armnn-3b72db05d6f8df28728b292c8bbd27c402dc8704.tar.gz | |
Fix for Github issue #78
Always use the Compute Library OpenCL stubs for linking,
but do not add the location to the runtime library path.
Change-Id: Ifc2fbec20183af1babf1167a8711e6709ad33210
| -rw-r--r-- | cmake/GlobalConfig.cmake | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index 61ce4cdf35..9d7dab0b8d 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -278,12 +278,9 @@ if(ARMCOMPUTECL) PATHS ${ARMCOMPUTE_ROOT}/include NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH) - find_library(OPENCL_LIBRARIES OpenCL) - if (NOT OPENCL_LIBRARIES) - # Link against libOpenCL in opencl-1.2-stubs, but don't search there at runtime - link_libraries(-L${ARMCOMPUTE_BUILD_DIR}/opencl-1.2-stubs) - set(OPENCL_LIBRARIES OpenCL) - endif() + # Link against libOpenCL in opencl-1.2-stubs, but don't search there at runtime + link_libraries(-L${ARMCOMPUTE_BUILD_DIR}/opencl-1.2-stubs) + set(OPENCL_LIBRARIES OpenCL) include_directories(${OPENCL_INCLUDE}) |