diff options
author | Matthew Bentham <Matthew.Bentham@arm.com> | 2020-03-10 11:13:17 +0000 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2020-03-10 13:11:14 +0000 |
commit | 6445cfff7519effd1df04eac88ae17d6e4e6693b (patch) | |
tree | c7cc7fe07fca254bb2b952a058160f1f7183d0c4 | |
parent | 8eb256065f0e75ecf8e427d56955e2bac117c2d7 (diff) | |
download | armnn-6445cfff7519effd1df04eac88ae17d6e4e6693b.tar.gz |
Github #326 Allow linking against shared Compute Library
As a last resort, check for shared Compute Library in standard paths.
This will work for Linux distribution builds where no static Compute
Library has been installed.
Change-Id: I1ea11d184ef9dcf4480ae0687a4ba81b402c5b2d
Signed-off-by: Matthew Bentham <Matthew.Bentham@arm.com>
-rw-r--r-- | cmake/GlobalConfig.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index f4e4ad548e..0df7cd408e 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -254,6 +254,14 @@ if(ARMCOMPUTENEON OR ARMCOMPUTECL) 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) + set(ARMCOMPUTE_LIBRARIES debug ${ARMCOMPUTE_LIBRARY_DEBUG} ${ARMCOMPUTE_CORE_LIBRARY_DEBUG} optimized ${ARMCOMPUTE_LIBRARY_RELEASE} ${ARMCOMPUTE_CORE_LIBRARY_RELEASE} ) |