From 023b1eb953873ed5d813e4cbcb5b0bf63eb70568 Mon Sep 17 00:00:00 2001
From: Kristofer Jonsson <kristofer.jonsson@arm.com>
Date: Wed, 23 Nov 2022 13:06:13 +0100
Subject: Remove ethosu_core and ethosu_applications

Interface libraries ethosu_core and ethosu_applications are removed.
Each application shall depend directly on the libraries they need.

Change-Id: I4d37c6c50aa276beaa8e2681a63cea90977477ce
---
 CMakeLists.txt                                |  6 ------
 applications/CMakeLists.txt                   |  5 +----
 applications/inference_process/CMakeLists.txt | 20 ++++++--------------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 917c6d8..85470f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,13 +60,11 @@ add_library(ethosu_core INTERFACE)
 
 # Build CMSIS
 include(cmsis.cmake)
-target_link_libraries(ethosu_core INTERFACE cmsis_core cmsis_device)
 
 # Build core driver
 if (CORE_SOFTWARE_ACCELERATOR STREQUAL "NPU")
     set(ETHOSU_PMU_INTERACTIVE OFF)
     add_subdirectory(${CORE_DRIVER_PATH} core_driver)
-    target_link_libraries(ethosu_core INTERFACE ethosu_core_driver)
 endif()
 
 # Build Tensorflow Lite Micro library
@@ -84,10 +82,6 @@ add_subdirectory(lib)
 # Build applications
 add_subdirectory(applications)
 
-
-# Merge libraries into static library
-target_link_libraries(ethosu_core INTERFACE tflu ethosu_applications)
-
 message(STATUS "*******************************************************")
 message(STATUS "PROJECT_NAME                           : ${PROJECT_NAME}")
 message(STATUS "CORE_SOFTWARE_RTOS                     : ${CORE_SOFTWARE_RTOS}")
diff --git a/applications/CMakeLists.txt b/applications/CMakeLists.txt
index 88dd052..1f6f6aa 100644
--- a/applications/CMakeLists.txt
+++ b/applications/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+# SPDX-FileCopyrightText: Copyright 2019-2022 Arm Limited and/or its affiliates <open-source-office@arm.com>
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -16,8 +16,5 @@
 # limitations under the License.
 #
 
-add_library(ethosu_applications INTERFACE)
-
 # Build inference process
 add_subdirectory(inference_process)
-target_link_libraries(ethosu_applications INTERFACE inference_process)
diff --git a/applications/inference_process/CMakeLists.txt b/applications/inference_process/CMakeLists.txt
index 4142f11..a26a1e2 100644
--- a/applications/inference_process/CMakeLists.txt
+++ b/applications/inference_process/CMakeLists.txt
@@ -18,26 +18,18 @@
 
 set(TR_PRINT_OUTPUT_BYTES "" CACHE STRING "Print output data.")
 
-add_library(inference_process STATIC)
+add_library(inference_process INTERFACE)
 
-target_include_directories(inference_process PUBLIC include)
+target_include_directories(inference_process INTERFACE include)
 
-target_link_libraries(inference_process PRIVATE tflu cmsis_core cmsis_device ethosu_crc)
-
-if (TARGET layer_by_layer_profiler)
-    target_link_libraries(inference_process PRIVATE layer_by_layer_profiler)
-endif()
+target_link_libraries(inference_process INTERFACE tflu cmsis_core cmsis_device ethosu_crc)
 
 if (TARGET arm_profiler)
-    target_link_libraries(inference_process PRIVATE arm_profiler)
+    target_link_libraries(inference_process INTERFACE arm_profiler)
 endif()
 
 if (TARGET ethosu_log)
-    target_link_libraries(inference_process PRIVATE ethosu_log)
+    target_link_libraries(inference_process INTERFACE ethosu_log)
 endif()
 
-target_sources(inference_process PRIVATE src/inference_process.cpp)
-
-if (DEFINED INFERENCE_PROCESS_OPS_RESOLVER)
-    target_compile_definitions(inference_process PRIVATE INFERENCE_PROCESS_OPS_RESOLVER=${INFERENCE_PROCESS_OPS_RESOLVER})
-endif()
\ No newline at end of file
+target_sources(inference_process INTERFACE src/inference_process.cpp)
-- 
cgit v1.2.1