Skip to content

Commit 92ac91b

Browse files
committed
CMake: unit-tests: Move mbed-headers-rtos to the rtos directory
Move the header-only mbed-headers-rtos library the unit test stubs depend on into the rtos component directory. This makes the rtos stubs more self-contained and improves the composition of the library.
1 parent 8ce55bf commit 92ac91b

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

UNITTESTS/stubs/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ add_library(mbed-headers-storage INTERFACE)
1010
add_library(mbed-headers-drivers INTERFACE)
1111
add_library(mbed-headers-hal INTERFACE)
1212
add_library(mbed-headers-events INTERFACE)
13-
add_library(mbed-headers-rtos INTERFACE)
1413

1514
target_link_libraries(mbed-headers
1615
INTERFACE
@@ -109,12 +108,6 @@ target_include_directories(mbed-headers-hal
109108
${mbed-os_SOURCE_DIR}/hal/include
110109
)
111110

112-
target_include_directories(mbed-headers-rtos
113-
INTERFACE
114-
${mbed-os_SOURCE_DIR}/rtos/include
115-
${mbed-os_SOURCE_DIR}/rtos/include/rtos
116-
)
117-
118111
target_include_directories(mbed-headers
119112
INTERFACE
120113
${mbed-os_SOURCE_DIR}/features

rtos/tests/UNITTESTS/doubles/CMakeLists.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4+
add_library(mbed-headers-rtos INTERFACE)
5+
6+
target_include_directories(mbed-headers-rtos
7+
INTERFACE
8+
${mbed-os_SOURCE_DIR}/rtos/include
9+
${mbed-os_SOURCE_DIR}/rtos/include/rtos
10+
)
11+
412
add_library(mbed-stubs-rtos-headers INTERFACE)
513

614
target_include_directories(mbed-stubs-rtos-headers

0 commit comments

Comments
 (0)