1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
Description: Use system libarm-compute library
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Author: Francis Murtagh <francis.murtagh@arm.com>
X-Dgit-Generated: 20.08-1 a87ca2399a3379e215d67a6f809a201d88750a16
---
--- armnn-20.08.orig/cmake/GlobalConfig.cmake
+++ armnn-20.08/cmake/GlobalConfig.cmake
@@ -282,10 +282,18 @@ if(ARMCOMPUTENEON OR ARMCOMPUTECL)
# In case it wasn't there, try a default search (will work in cases where
# the library has been installed into a standard location)
- find_library(ARMCOMPUTE_LIBRARY_DEBUG NAMES arm_compute-static)
- find_library(ARMCOMPUTE_LIBRARY_RELEASE NAMES arm_compute-static)
- find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core-static)
- find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core-static)
+ #find_library(ARMCOMPUTE_LIBRARY_DEBUG NAMES arm_compute-static)
+ #find_library(ARMCOMPUTE_LIBRARY_RELEASE NAMES arm_compute-static)
+ #find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core-static)
+ #find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core-static)
+
+ # In case it wasn't there, try the dynamic libraries
+ # This case will get used in a linux setup where the Compute Library
+ # has been installed in a standard system library path as a dynamic library
+ find_library(ARMCOMPUTE_LIBRARY_DEBUG NAMES arm_compute)
+ find_library(ARMCOMPUTE_LIBRARY_RELEASE NAMES arm_compute)
+ find_library(ARMCOMPUTE_CORE_LIBRARY_DEBUG NAMES arm_compute_core)
+ find_library(ARMCOMPUTE_CORE_LIBRARY_RELEASE NAMES arm_compute_core)
# In case it wasn't there, try the dynamic libraries
# This case will get used in a linux setup where the Compute Library
|
