Configure ARMCompute correctly (#4066)

This commit updates Makefile and ARMComputeConfig.cmake to correctly
configure ARMCompute library targets even for CI build.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/Makefile b/Makefile
index d484f14..d7f9487 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,13 @@ clean:
        rm -rf $(WORKDIR)
        rm -rf externals/*.stamp
 
-acl: internal_acl_build internal_acl_install
+acl:
+ifeq ($(EXT_ACL_FOLDER),)
+       # Skip internal_acl_build when EXT_ACL_FOLDER is set
+       # NOTE internal_acl_build depends on configure
+       make internal_acl_build
+endif
+       make internal_acl_install
 
 check: check_internal
 

diff --git a/cmake/packages/ARMComputeConfig.cmake b/cmake/packages/ARMComputeConfig.cmake
index 656163a..bc877e7 100644 (file)
--- a/cmake/packages/ARMComputeConfig.cmake
+++ b/cmake/packages/ARMComputeConfig.cmake
@@ -29,8 +29,8 @@ function(_ARMCompute_Import)
   endif()
 
   if(NOT CORE_LIBRARY)
-    return()
     set(ARMCompute_FOUND FALSE PARENT_SCOPE)
+    return()
   endif()
 
   if(NOT RUNTIME_LIBRARY AND EXISTS ${CMAKE_INSTALL_PREFIX}/lib/libarm_compute.so)
@@ -38,8 +38,8 @@ function(_ARMCompute_Import)
   endif()
 
   if(NOT RUNTIME_LIBRARY)
-    return()
     set(ARMCompute_FOUND FALSE PARENT_SCOPE)
+    return()
   endif()
 
   if(NOT GRAPH_LIBRARY AND EXISTS ${CMAKE_INSTALL_PREFIX}/lib/libarm_compute_graph.so)
@@ -47,8 +47,8 @@ function(_ARMCompute_Import)
   endif()
 
   if(NOT GRAPH_LIBRARY)
-    return()
     set(ARMCompute_FOUND FALSE PARENT_SCOPE)
+    return()
   endif()
 
   if(NOT TARGET arm_compute_core)