From bf06897b8f03cf58893b76408e8acba2ad189de6 Mon Sep 17 00:00:00 2001 From: Rajkumar Kanagaraj Date: Thu, 24 Jun 2021 03:49:43 -0700 Subject: [PATCH] CMake: unit-tests: Move mbed-headers-hal to the hal directory Move the header-only mbed-headers-hal library the unit test stubs depend on into the hal component directory. This makes the events stubs more self-contained and improves the composition of the library. --- UNITTESTS/stubs/CMakeLists.txt | 7 ------- hal/tests/UNITTESTS/doubles/CMakeLists.txt | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt index 5e65d9f112..677566fe77 100644 --- a/UNITTESTS/stubs/CMakeLists.txt +++ b/UNITTESTS/stubs/CMakeLists.txt @@ -7,7 +7,6 @@ add_library(mbed-headers-base INTERFACE) add_library(mbed-headers-platform INTERFACE) add_library(mbed-headers-connectivity INTERFACE) add_library(mbed-headers-storage INTERFACE) -add_library(mbed-headers-hal INTERFACE) add_library(mbed-headers-events INTERFACE) target_link_libraries(mbed-headers @@ -89,12 +88,6 @@ target_include_directories(mbed-headers-events ${mbed-os_SOURCE_DIR}/events/include/events/internal ) -target_include_directories(mbed-headers-hal - INTERFACE - ${mbed-os_SOURCE_DIR}/hal - ${mbed-os_SOURCE_DIR}/hal/include -) - target_include_directories(mbed-headers INTERFACE ${mbed-os_SOURCE_DIR}/features diff --git a/hal/tests/UNITTESTS/doubles/CMakeLists.txt b/hal/tests/UNITTESTS/doubles/CMakeLists.txt index a327d31efc..a9b6abfdd2 100644 --- a/hal/tests/UNITTESTS/doubles/CMakeLists.txt +++ b/hal/tests/UNITTESTS/doubles/CMakeLists.txt @@ -1,6 +1,14 @@ # Copyright (c) 2021 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_library(mbed-headers-hal INTERFACE) + +target_include_directories(mbed-headers-hal + INTERFACE + ${mbed-os_SOURCE_DIR}/hal + ${mbed-os_SOURCE_DIR}/hal/include +) + add_library(mbed-stubs-hal) target_compile_definitions(mbed-stubs-hal