From 3b72db05d6f8df28728b292c8bbd27c402dc8704 Mon Sep 17 00:00:00 2001
From: Matthew Bentham <matthew.bentham@arm.com>
Date: Thu, 11 Oct 2018 09:47:01 +0100
Subject: 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
---
 cmake/GlobalConfig.cmake | 9 +++------
 1 file 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})
 
-- 
cgit v1.2.1