Skip to content

Commit 9244625

Browse files
authored
Merge pull request #14786 from ARMmbed/move_drivers_stub
Move mbed-stubs-drivers to the drivers directory
2 parents 28cdb37 + e64d1c7 commit 9244625

File tree

5 files changed

+14
-12
lines changed

5 files changed

+14
-12
lines changed

UNITTESTS/stubs/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ add_library(mbed-headers-base INTERFACE)
77
add_library(mbed-headers-platform INTERFACE)
88
add_library(mbed-headers-connectivity INTERFACE)
99
add_library(mbed-headers-storage INTERFACE)
10-
add_library(mbed-headers-drivers INTERFACE)
1110
add_library(mbed-headers-hal INTERFACE)
1211
add_library(mbed-headers-events INTERFACE)
1312
add_library(mbed-headers-rtos INTERFACE)
@@ -87,13 +86,6 @@ target_include_directories(mbed-headers-connectivity
8786
${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
8887
)
8988

90-
target_include_directories(mbed-headers-drivers
91-
INTERFACE
92-
${mbed-os_SOURCE_DIR}/drivers
93-
${mbed-os_SOURCE_DIR}/drivers/include
94-
${mbed-os_SOURCE_DIR}/drivers/include/drivers
95-
)
96-
9789
target_include_directories(mbed-headers-events
9890
INTERFACE
9991
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
@@ -128,7 +120,6 @@ target_include_directories(mbed-stubs-headers
128120
)
129121

130122
add_subdirectory(connectivity)
131-
add_subdirectory(drivers)
132123
add_subdirectory(events)
133124
add_subdirectory(hal)
134125
add_subdirectory(platform)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copyright (c) 2021 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
3-
3+
add_subdirectory(doubles)
44
add_subdirectory(PwmOut)
55
add_subdirectory(Watchdog)

UNITTESTS/stubs/drivers/CMakeLists.txt renamed to drivers/tests/UNITTESTS/doubles/CMakeLists.txt

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

4+
add_library(mbed-headers-drivers INTERFACE)
5+
6+
target_include_directories(mbed-headers-drivers
7+
INTERFACE
8+
${mbed-os_SOURCE_DIR}/drivers
9+
${mbed-os_SOURCE_DIR}/drivers/include
10+
${mbed-os_SOURCE_DIR}/drivers/include/drivers
11+
)
12+
413
add_library(mbed-stubs-drivers)
514

615
target_sources(mbed-stubs-drivers
@@ -18,6 +27,8 @@ target_compile_definitions(mbed-stubs-drivers
1827

1928
target_link_libraries(mbed-stubs-drivers
2029
PRIVATE
21-
mbed-headers
22-
mbed-stubs-headers
30+
mbed-headers-base
31+
mbed-headers-hal
32+
mbed-headers-drivers
33+
mbed-headers-platform
2334
)

0 commit comments

Comments
 (0)