ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

CMake: Fix failures due to device_key and storage dirs move

pull/13566/head
Hugues Kamba 2020-08-24 22:17:42 +01:00
parent b3c614e921
commit f12f9adbed
5 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/CMakeLists.txt
View File

@ -1,6 +1,8 @@
# Copyright (c) 2020 ARM Limited. All rights reserved. # Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
add_subdirectory(device_key)
target_include_directories(mbed-os target_include_directories(mbed-os
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}

3
features/device_key/CMakeLists.txt → drivers/device_key/CMakeLists.txt
View File

@ -3,7 +3,8 @@
target_include_directories(mbed-os target_include_directories(mbed-os
PUBLIC PUBLIC
source ${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include/device_key
) )
target_sources(mbed-os target_sources(mbed-os

1
features/CMakeLists.txt
View File

@ -3,7 +3,6 @@
mbed_add_cmake_directory_if_labels("FEATURE") mbed_add_cmake_directory_if_labels("FEATURE")
add_subdirectory(device_key)
add_subdirectory(frameworks/mbed-client-randlib) add_subdirectory(frameworks/mbed-client-randlib)
add_subdirectory(frameworks/mbed-trace) add_subdirectory(frameworks/mbed-trace)
add_subdirectory(frameworks/mbed-client-cli) add_subdirectory(frameworks/mbed-client-cli)

14
storage/blockdevice/COMPONENT_FLASHIAP/CMakeLists.txt
View File

@ -1,12 +1,14 @@
# Copyright (c) 2020 ARM Limited. All rights reserved. # Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
target_sources(mbed-os
PRIVATE
FlashIAPBlockDevice.cpp
)
target_include_directories(mbed-os target_include_directories(mbed-os
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include/FlashIAP
)
target_sources(mbed-os
PRIVATE
source/FlashIAPBlockDevice.cpp
) )

12
storage/blockdevice/COMPONENT_QSPIF/CMakeLists.txt
View File

@ -1,12 +1,14 @@
# Copyright (c) 2020 ARM Limited. All rights reserved. # Copyright (c) 2020 ARM Limited. All rights reserved.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
target_sources(mbed-os
PRIVATE
QSPIFBlockDevice.cpp
)
target_include_directories(mbed-os target_include_directories(mbed-os
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/include
${CMAKE_CURRENT_SOURCE_DIR}/include/QSPIF
)
target_sources(mbed-os
PRIVATE
source/QSPIFBlockDevice.cpp
) )