Skip to content

Commit dfd8996

Browse files
authored
Merge pull request #14823 from ARMmbed/move_events_stub
Move events stubs to events dir
2 parents e70d8c6 + 863ef79 commit dfd8996

15 files changed

+43
-32
lines changed

UNITTESTS/fakes/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
add_subdirectory(events)
54
add_subdirectory(ble)

UNITTESTS/stubs/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ add_library(mbed-stubs-headers INTERFACE)
55
add_library(mbed-headers INTERFACE)
66
add_library(mbed-headers-base INTERFACE)
77
add_library(mbed-headers-connectivity INTERFACE)
8-
add_library(mbed-headers-events INTERFACE)
98

109
target_link_libraries(mbed-headers
1110
INTERFACE
@@ -40,15 +39,6 @@ target_include_directories(mbed-headers-connectivity
4039
${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
4140
)
4241

43-
target_include_directories(mbed-headers-events
44-
INTERFACE
45-
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
46-
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h/equeue
47-
${mbed-os_SOURCE_DIR}/events/include
48-
${mbed-os_SOURCE_DIR}/events/include/events
49-
${mbed-os_SOURCE_DIR}/events/include/events/internal
50-
)
51-
5242
target_include_directories(mbed-headers
5343
INTERFACE
5444
${mbed-os_SOURCE_DIR}/features
@@ -62,7 +52,6 @@ target_include_directories(mbed-stubs-headers
6252
)
6353

6454
add_subdirectory(connectivity)
65-
add_subdirectory(events)
6655

6756
add_library(mbed-stubs INTERFACE)
6857

UNITTESTS/stubs/events/CMakeLists.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.

events/tests/UNITTESTS/CMakeLists.txt

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

4+
add_subdirectory(doubles)
45
add_subdirectory(equeue)
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Copyright (c) 2021 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
add_subdirectory(fakes)
5+
6+
add_library(mbed-headers-events INTERFACE)
7+
8+
target_include_directories(mbed-headers-events
9+
INTERFACE
10+
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
11+
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h/equeue
12+
${mbed-os_SOURCE_DIR}/events/include
13+
${mbed-os_SOURCE_DIR}/events/include/events
14+
${mbed-os_SOURCE_DIR}/events/include/events/internal
15+
)
16+
17+
add_library(mbed-stubs-events)
18+
19+
target_sources(mbed-stubs-events
20+
PRIVATE
21+
equeue_stub.c
22+
EqueuePosix_stub.c
23+
EventFlags_stub.cpp
24+
EventQueue_stub.cpp
25+
mbed_shared_queues_stub.cpp
26+
)
27+
28+
target_include_directories(mbed-stubs-events
29+
PUBLIC
30+
.
31+
)
32+
33+
target_link_libraries(mbed-stubs-events
34+
PRIVATE
35+
mbed-headers-base
36+
mbed-headers-drivers
37+
mbed-headers-hal
38+
mbed-headers-events
39+
mbed-headers-rtos
40+
mbed-headers-platform
41+
)

0 commit comments

Comments
 (0)