Skip to content

Commit 158dad7

Browse files
committed
CMake: Fix build due to hal dir move
1 parent 9a810e8 commit 158dad7

File tree

3 files changed

+49
-20
lines changed

3 files changed

+49
-20
lines changed

hal/CMakeLists.txt

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

4+
mbed_add_cmake_directory_if_labels("TARGET")
5+
6+
add_subdirectory(usb)
7+
48
target_include_directories(mbed-os
59
PUBLIC
6-
${CMAKE_CURRENT_SOURCE_DIR}
7-
usb
10+
include
11+
include/hal
812
)
913

1014
target_sources(mbed-os
1115
PRIVATE
12-
LowPowerTickerWrapper.cpp
13-
mbed_compat.c
14-
mbed_critical_section_api.c
15-
mbed_flash_api.c
16-
mbed_gpio.c
17-
mbed_gpio_irq.c
18-
mbed_itm_api.c
19-
mbed_lp_ticker_api.c
20-
mbed_lp_ticker_wrapper.cpp
21-
mbed_pinmap_common.c
22-
mbed_pinmap_default.cpp
23-
mbed_ticker_api.c
24-
mbed_us_ticker_api.c
25-
static_pinmap.cpp
26-
27-
mpu/mbed_mpu_v7m.c
28-
mpu/mbed_mpu_v8m.c
16+
source/LowPowerTickerWrapper.cpp
17+
source/mbed_compat.c
18+
source/mbed_critical_section_api.c
19+
source/mbed_flash_api.c
20+
source/mbed_gpio.c
21+
source/mbed_gpio_irq.c
22+
source/mbed_itm_api.c
23+
source/mbed_lp_ticker_api.c
24+
source/mbed_lp_ticker_wrapper.cpp
25+
source/mbed_pinmap_common.c
26+
source/mbed_pinmap_default.cpp
27+
source/mbed_ticker_api.c
28+
source/mbed_us_ticker_api.c
29+
source/static_pinmap.cpp
2930

30-
usb/mbed_usb_phy.cpp
31+
source/mpu/mbed_mpu_v7m.c
32+
source/mpu/mbed_mpu_v8m.c
3133
)
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Copyright (c) 2020 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
target_include_directories(mbed-os
5+
PUBLIC
6+
.
7+
)
8+
9+
target_sources(mbed-os
10+
PRIVATE
11+
flash_common_algo.c
12+
)

hal/usb/CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# Copyright (c) 2020 ARM Limited. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
mbed_add_cmake_directory_if_labels("TARGET")
5+
6+
target_include_directories(mbed-os
7+
PUBLIC
8+
include
9+
include/usb
10+
)
11+
12+
target_sources(mbed-os
13+
PRIVATE
14+
source/mbed_usb_phy.cpp
15+
)

0 commit comments

Comments
 (0)