Merge pull request #14786 from ARMmbed/move_drivers_stub

Move mbed-stubs-drivers to the drivers directory
pull/14838/head
Martin Kojtal 2021-06-24 15:43:37 +02:00 committed by GitHub
commit 9244625508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 12 deletions

View File

@ -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-drivers INTERFACE)
add_library(mbed-headers-hal INTERFACE)
add_library(mbed-headers-events INTERFACE)
add_library(mbed-headers-rtos INTERFACE)
@ -87,13 +86,6 @@ target_include_directories(mbed-headers-connectivity
${mbed-os_SOURCE_DIR}/connectivity/FEATURE_BLE/include/ble
)
target_include_directories(mbed-headers-drivers
INTERFACE
${mbed-os_SOURCE_DIR}/drivers
${mbed-os_SOURCE_DIR}/drivers/include
${mbed-os_SOURCE_DIR}/drivers/include/drivers
)
target_include_directories(mbed-headers-events
INTERFACE
${mbed-os_SOURCE_DIR}/events/tests/UNITTESTS/target_h
@ -128,7 +120,6 @@ target_include_directories(mbed-stubs-headers
)
add_subdirectory(connectivity)
add_subdirectory(drivers)
add_subdirectory(events)
add_subdirectory(hal)
add_subdirectory(platform)

View File

@ -1,5 +1,5 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_subdirectory(doubles)
add_subdirectory(PwmOut)
add_subdirectory(Watchdog)

View File

@ -1,6 +1,15 @@
# Copyright (c) 2021 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
add_library(mbed-headers-drivers INTERFACE)
target_include_directories(mbed-headers-drivers
INTERFACE
${mbed-os_SOURCE_DIR}/drivers
${mbed-os_SOURCE_DIR}/drivers/include
${mbed-os_SOURCE_DIR}/drivers/include/drivers
)
add_library(mbed-stubs-drivers)
target_sources(mbed-stubs-drivers
@ -18,6 +27,8 @@ target_compile_definitions(mbed-stubs-drivers
target_link_libraries(mbed-stubs-drivers
PRIVATE
mbed-headers
mbed-stubs-headers
mbed-headers-base
mbed-headers-hal
mbed-headers-drivers
mbed-headers-platform
)