From bd45acba8c83bfeae6598aa1372702161a06eb7a Mon Sep 17 00:00:00 2001 From: Hugues Kamba Date: Fri, 24 Jul 2020 00:07:32 +0100 Subject: [PATCH] CMake: Fix failure due to kvstore and cellular dirs changes --- connectivity/CMakeLists.txt | 1 + connectivity/cellular/CMakeLists.txt | 16 ++++++++++ .../source/framework/AT/CMakeLists.txt | 13 ++++++++ .../cellular/source}/framework/CMakeLists.txt | 2 -- .../source/framework/common/CMakeLists.txt | 9 ++++++ .../source/framework/device/CMakeLists.txt | 10 +++++++ .../cellular}/Altair/ALT1250/CMakeLists.txt | 0 .../Altair/ALT1250/PPP/CMakeLists.txt | 0 .../drivers/cellular}/Altair/CMakeLists.txt | 0 connectivity/drivers/cellular/CMakeLists.txt | 1 + .../GEMALTO/CINTERION/CMakeLists.txt | 0 .../drivers/cellular/GEMALTO}/CMakeLists.txt | 0 .../drivers/cellular/GENERIC}/CMakeLists.txt | 0 .../GENERIC/GENERIC_AT3GPP/CMakeLists.txt | 0 .../cellular/MultiTech}/CMakeLists.txt | 0 .../MultiTech/DragonflyNano}/CMakeLists.txt | 0 .../DragonflyNano/PPP/CMakeLists.txt | 0 .../cellular}/QUECTEL/BC95/CMakeLists.txt | 0 .../cellular}/QUECTEL/BG96/CMakeLists.txt | 0 .../drivers/cellular/QUECTEL}/CMakeLists.txt | 0 .../cellular}/QUECTEL/EC2X/CMakeLists.txt | 0 .../cellular}/QUECTEL/M26/CMakeLists.txt | 0 .../cellular}/QUECTEL/UG96/CMakeLists.txt | 0 .../cellular}/RiotMicro/AT/CMakeLists.txt | 0 .../cellular/RiotMicro}/CMakeLists.txt | 0 .../drivers/cellular/TELIT}/CMakeLists.txt | 0 .../cellular}/TELIT/HE910/CMakeLists.txt | 0 .../cellular}/TELIT/ME310/CMakeLists.txt | 0 .../cellular}/TELIT/ME910/CMakeLists.txt | 0 .../drivers/cellular}/UBLOX/AT/CMakeLists.txt | 0 .../drivers/cellular/UBLOX}/CMakeLists.txt | 0 .../cellular}/UBLOX/N2XX/CMakeLists.txt | 0 .../cellular}/UBLOX/PPP/CMakeLists.txt | 0 features/CMakeLists.txt | 1 - .../cellular/framework/API/CMakeLists.txt | 7 ----- features/cellular/framework/AT/CMakeLists.txt | 18 ----------- .../cellular/framework/common/CMakeLists.txt | 14 --------- .../cellular/framework/device/CMakeLists.txt | 15 ---------- .../framework/targets/UBLOX/CMakeLists.txt | 4 --- storage/kvstore/CMakeLists.txt | 30 +++++++------------ .../direct_access_devicekey/CMakeLists.txt | 14 +++++++++ storage/kvstore/kv_config/CMakeLists.txt | 14 +++++++++ storage/kvstore/securestore/CMakeLists.txt | 14 +++++++++ 43 files changed, 102 insertions(+), 81 deletions(-) create mode 100644 connectivity/cellular/CMakeLists.txt create mode 100644 connectivity/cellular/source/framework/AT/CMakeLists.txt rename {features/cellular => connectivity/cellular/source}/framework/CMakeLists.txt (77%) create mode 100644 connectivity/cellular/source/framework/common/CMakeLists.txt create mode 100644 connectivity/cellular/source/framework/device/CMakeLists.txt rename {features/cellular/framework/targets => connectivity/drivers/cellular}/Altair/ALT1250/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/Altair/ALT1250/PPP/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/Altair/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/GEMALTO/CINTERION/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular/GEMALTO}/CMakeLists.txt (100%) rename {features/cellular/framework/targets/GEMALTO => connectivity/drivers/cellular/GENERIC}/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/GENERIC/GENERIC_AT3GPP/CMakeLists.txt (100%) rename {features/cellular/framework/targets/GENERIC => connectivity/drivers/cellular/MultiTech}/CMakeLists.txt (100%) rename {features/cellular/framework/targets/MultiTech => connectivity/drivers/cellular/MultiTech/DragonflyNano}/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/MultiTech/DragonflyNano/PPP/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/QUECTEL/BC95/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/QUECTEL/BG96/CMakeLists.txt (100%) rename {features/cellular/framework/targets/MultiTech/DragonflyNano => connectivity/drivers/cellular/QUECTEL}/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/QUECTEL/EC2X/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/QUECTEL/M26/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/QUECTEL/UG96/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/RiotMicro/AT/CMakeLists.txt (100%) rename {features/cellular/framework/targets/QUECTEL => connectivity/drivers/cellular/RiotMicro}/CMakeLists.txt (100%) rename {features/cellular/framework/targets/RiotMicro => connectivity/drivers/cellular/TELIT}/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/TELIT/HE910/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/TELIT/ME310/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/TELIT/ME910/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/UBLOX/AT/CMakeLists.txt (100%) rename {features/cellular/framework/targets/TELIT => connectivity/drivers/cellular/UBLOX}/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/UBLOX/N2XX/CMakeLists.txt (100%) rename {features/cellular/framework/targets => connectivity/drivers/cellular}/UBLOX/PPP/CMakeLists.txt (100%) delete mode 100644 features/cellular/framework/API/CMakeLists.txt delete mode 100644 features/cellular/framework/AT/CMakeLists.txt delete mode 100644 features/cellular/framework/common/CMakeLists.txt delete mode 100644 features/cellular/framework/device/CMakeLists.txt delete mode 100644 features/cellular/framework/targets/UBLOX/CMakeLists.txt create mode 100644 storage/kvstore/direct_access_devicekey/CMakeLists.txt create mode 100644 storage/kvstore/kv_config/CMakeLists.txt create mode 100644 storage/kvstore/securestore/CMakeLists.txt diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt index 6d157a0f0b..3235a2300f 100644 --- a/connectivity/CMakeLists.txt +++ b/connectivity/CMakeLists.txt @@ -1,5 +1,6 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_subdirectory(cellular) add_subdirectory(drivers) add_subdirectory(libraries) diff --git a/connectivity/cellular/CMakeLists.txt b/connectivity/cellular/CMakeLists.txt new file mode 100644 index 0000000000..48ec8fa5ee --- /dev/null +++ b/connectivity/cellular/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +add_subdirectory(source/framework) + +target_include_directories(mbed-os + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular + ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework + ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/API + ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/AT + ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/common + ${CMAKE_CURRENT_SOURCE_DIR}/include/cellular/framework/device +) diff --git a/connectivity/cellular/source/framework/AT/CMakeLists.txt b/connectivity/cellular/source/framework/AT/CMakeLists.txt new file mode 100644 index 0000000000..a2587cd1f8 --- /dev/null +++ b/connectivity/cellular/source/framework/AT/CMakeLists.txt @@ -0,0 +1,13 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +target_sources(mbed-os + PRIVATE + AT_CellularContext.cpp + AT_CellularDevice.cpp + AT_CellularInformation.cpp + AT_CellularNetwork.cpp + AT_CellularSMS.cpp + AT_CellularStack.cpp + AT_ControlPlane_netif.cpp +) diff --git a/features/cellular/framework/CMakeLists.txt b/connectivity/cellular/source/framework/CMakeLists.txt similarity index 77% rename from features/cellular/framework/CMakeLists.txt rename to connectivity/cellular/source/framework/CMakeLists.txt index f06e83208f..08ce155f45 100644 --- a/features/cellular/framework/CMakeLists.txt +++ b/connectivity/cellular/source/framework/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 -add_subdirectory(API) add_subdirectory(AT) add_subdirectory(common) add_subdirectory(device) -add_subdirectory(targets) diff --git a/connectivity/cellular/source/framework/common/CMakeLists.txt b/connectivity/cellular/source/framework/common/CMakeLists.txt new file mode 100644 index 0000000000..bd1be4ab1b --- /dev/null +++ b/connectivity/cellular/source/framework/common/CMakeLists.txt @@ -0,0 +1,9 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +target_sources(mbed-os + PRIVATE + APN_db.cpp + CellularLog.cpp + CellularUtil.cpp +) diff --git a/connectivity/cellular/source/framework/device/CMakeLists.txt b/connectivity/cellular/source/framework/device/CMakeLists.txt new file mode 100644 index 0000000000..3bdaef504d --- /dev/null +++ b/connectivity/cellular/source/framework/device/CMakeLists.txt @@ -0,0 +1,10 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +target_sources(mbed-os + PRIVATE + ATHandler.cpp + CellularContext.cpp + CellularDevice.cpp + CellularStateMachine.cpp +) diff --git a/features/cellular/framework/targets/Altair/ALT1250/CMakeLists.txt b/connectivity/drivers/cellular/Altair/ALT1250/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/Altair/ALT1250/CMakeLists.txt rename to connectivity/drivers/cellular/Altair/ALT1250/CMakeLists.txt diff --git a/features/cellular/framework/targets/Altair/ALT1250/PPP/CMakeLists.txt b/connectivity/drivers/cellular/Altair/ALT1250/PPP/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/Altair/ALT1250/PPP/CMakeLists.txt rename to connectivity/drivers/cellular/Altair/ALT1250/PPP/CMakeLists.txt diff --git a/features/cellular/framework/targets/Altair/CMakeLists.txt b/connectivity/drivers/cellular/Altair/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/Altair/CMakeLists.txt rename to connectivity/drivers/cellular/Altair/CMakeLists.txt diff --git a/connectivity/drivers/cellular/CMakeLists.txt b/connectivity/drivers/cellular/CMakeLists.txt index c692f36c01..92c988bbbc 100644 --- a/connectivity/drivers/cellular/CMakeLists.txt +++ b/connectivity/drivers/cellular/CMakeLists.txt @@ -2,3 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 mbed_add_cmake_directory_if_labels("COMPONENT") +mbed_add_cmake_directory_if_labels("") diff --git a/features/cellular/framework/targets/GEMALTO/CINTERION/CMakeLists.txt b/connectivity/drivers/cellular/GEMALTO/CINTERION/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/GEMALTO/CINTERION/CMakeLists.txt rename to connectivity/drivers/cellular/GEMALTO/CINTERION/CMakeLists.txt diff --git a/features/cellular/framework/targets/CMakeLists.txt b/connectivity/drivers/cellular/GEMALTO/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/CMakeLists.txt rename to connectivity/drivers/cellular/GEMALTO/CMakeLists.txt diff --git a/features/cellular/framework/targets/GEMALTO/CMakeLists.txt b/connectivity/drivers/cellular/GENERIC/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/GEMALTO/CMakeLists.txt rename to connectivity/drivers/cellular/GENERIC/CMakeLists.txt diff --git a/features/cellular/framework/targets/GENERIC/GENERIC_AT3GPP/CMakeLists.txt b/connectivity/drivers/cellular/GENERIC/GENERIC_AT3GPP/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/GENERIC/GENERIC_AT3GPP/CMakeLists.txt rename to connectivity/drivers/cellular/GENERIC/GENERIC_AT3GPP/CMakeLists.txt diff --git a/features/cellular/framework/targets/GENERIC/CMakeLists.txt b/connectivity/drivers/cellular/MultiTech/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/GENERIC/CMakeLists.txt rename to connectivity/drivers/cellular/MultiTech/CMakeLists.txt diff --git a/features/cellular/framework/targets/MultiTech/CMakeLists.txt b/connectivity/drivers/cellular/MultiTech/DragonflyNano/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/MultiTech/CMakeLists.txt rename to connectivity/drivers/cellular/MultiTech/DragonflyNano/CMakeLists.txt diff --git a/features/cellular/framework/targets/MultiTech/DragonflyNano/PPP/CMakeLists.txt b/connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/MultiTech/DragonflyNano/PPP/CMakeLists.txt rename to connectivity/drivers/cellular/MultiTech/DragonflyNano/PPP/CMakeLists.txt diff --git a/features/cellular/framework/targets/QUECTEL/BC95/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/BC95/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/QUECTEL/BC95/CMakeLists.txt rename to connectivity/drivers/cellular/QUECTEL/BC95/CMakeLists.txt diff --git a/features/cellular/framework/targets/QUECTEL/BG96/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/BG96/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/QUECTEL/BG96/CMakeLists.txt rename to connectivity/drivers/cellular/QUECTEL/BG96/CMakeLists.txt diff --git a/features/cellular/framework/targets/MultiTech/DragonflyNano/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/MultiTech/DragonflyNano/CMakeLists.txt rename to connectivity/drivers/cellular/QUECTEL/CMakeLists.txt diff --git a/features/cellular/framework/targets/QUECTEL/EC2X/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/QUECTEL/EC2X/CMakeLists.txt rename to connectivity/drivers/cellular/QUECTEL/EC2X/CMakeLists.txt diff --git a/features/cellular/framework/targets/QUECTEL/M26/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/M26/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/QUECTEL/M26/CMakeLists.txt rename to connectivity/drivers/cellular/QUECTEL/M26/CMakeLists.txt diff --git a/features/cellular/framework/targets/QUECTEL/UG96/CMakeLists.txt b/connectivity/drivers/cellular/QUECTEL/UG96/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/QUECTEL/UG96/CMakeLists.txt rename to connectivity/drivers/cellular/QUECTEL/UG96/CMakeLists.txt diff --git a/features/cellular/framework/targets/RiotMicro/AT/CMakeLists.txt b/connectivity/drivers/cellular/RiotMicro/AT/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/RiotMicro/AT/CMakeLists.txt rename to connectivity/drivers/cellular/RiotMicro/AT/CMakeLists.txt diff --git a/features/cellular/framework/targets/QUECTEL/CMakeLists.txt b/connectivity/drivers/cellular/RiotMicro/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/QUECTEL/CMakeLists.txt rename to connectivity/drivers/cellular/RiotMicro/CMakeLists.txt diff --git a/features/cellular/framework/targets/RiotMicro/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/RiotMicro/CMakeLists.txt rename to connectivity/drivers/cellular/TELIT/CMakeLists.txt diff --git a/features/cellular/framework/targets/TELIT/HE910/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/HE910/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/TELIT/HE910/CMakeLists.txt rename to connectivity/drivers/cellular/TELIT/HE910/CMakeLists.txt diff --git a/features/cellular/framework/targets/TELIT/ME310/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/ME310/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/TELIT/ME310/CMakeLists.txt rename to connectivity/drivers/cellular/TELIT/ME310/CMakeLists.txt diff --git a/features/cellular/framework/targets/TELIT/ME910/CMakeLists.txt b/connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/TELIT/ME910/CMakeLists.txt rename to connectivity/drivers/cellular/TELIT/ME910/CMakeLists.txt diff --git a/features/cellular/framework/targets/UBLOX/AT/CMakeLists.txt b/connectivity/drivers/cellular/UBLOX/AT/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/UBLOX/AT/CMakeLists.txt rename to connectivity/drivers/cellular/UBLOX/AT/CMakeLists.txt diff --git a/features/cellular/framework/targets/TELIT/CMakeLists.txt b/connectivity/drivers/cellular/UBLOX/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/TELIT/CMakeLists.txt rename to connectivity/drivers/cellular/UBLOX/CMakeLists.txt diff --git a/features/cellular/framework/targets/UBLOX/N2XX/CMakeLists.txt b/connectivity/drivers/cellular/UBLOX/N2XX/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/UBLOX/N2XX/CMakeLists.txt rename to connectivity/drivers/cellular/UBLOX/N2XX/CMakeLists.txt diff --git a/features/cellular/framework/targets/UBLOX/PPP/CMakeLists.txt b/connectivity/drivers/cellular/UBLOX/PPP/CMakeLists.txt similarity index 100% rename from features/cellular/framework/targets/UBLOX/PPP/CMakeLists.txt rename to connectivity/drivers/cellular/UBLOX/PPP/CMakeLists.txt diff --git a/features/CMakeLists.txt b/features/CMakeLists.txt index 7eb0b2d64a..0b018754bc 100644 --- a/features/CMakeLists.txt +++ b/features/CMakeLists.txt @@ -3,7 +3,6 @@ mbed_add_cmake_directory_if_labels("FEATURE") -add_subdirectory(cellular/framework) add_subdirectory(cryptocell) add_subdirectory(device_key) add_subdirectory(frameworks/mbed-client-randlib) diff --git a/features/cellular/framework/API/CMakeLists.txt b/features/cellular/framework/API/CMakeLists.txt deleted file mode 100644 index 1ff5b9ff96..0000000000 --- a/features/cellular/framework/API/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -target_include_directories(mbed-os - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} -) diff --git a/features/cellular/framework/AT/CMakeLists.txt b/features/cellular/framework/AT/CMakeLists.txt deleted file mode 100644 index d368e0d667..0000000000 --- a/features/cellular/framework/AT/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -target_include_directories(mbed-os - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} -) - -target_sources(mbed-os - PRIVATE - AT_CellularContext.cpp - AT_CellularDevice.cpp - AT_CellularInformation.cpp - AT_CellularNetwork.cpp - AT_CellularSMS.cpp - AT_CellularStack.cpp - AT_ControlPlane_netif.cpp -) diff --git a/features/cellular/framework/common/CMakeLists.txt b/features/cellular/framework/common/CMakeLists.txt deleted file mode 100644 index 1bb226277b..0000000000 --- a/features/cellular/framework/common/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -target_include_directories(mbed-os - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} -) - -target_sources(mbed-os - PRIVATE - APN_db.cpp - CellularLog.cpp - CellularUtil.cpp -) diff --git a/features/cellular/framework/device/CMakeLists.txt b/features/cellular/framework/device/CMakeLists.txt deleted file mode 100644 index 6818af2bfc..0000000000 --- a/features/cellular/framework/device/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -target_include_directories(mbed-os - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} -) - -target_sources(mbed-os - PRIVATE - ATHandler.cpp - CellularContext.cpp - CellularDevice.cpp - CellularStateMachine.cpp -) diff --git a/features/cellular/framework/targets/UBLOX/CMakeLists.txt b/features/cellular/framework/targets/UBLOX/CMakeLists.txt deleted file mode 100644 index 093a7d33b2..0000000000 --- a/features/cellular/framework/targets/UBLOX/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2020 ARM Limited. All rights reserved. -# SPDX-License-Identifier: Apache-2.0 - -mbed_add_cmake_directory_if_labels("") diff --git a/storage/kvstore/CMakeLists.txt b/storage/kvstore/CMakeLists.txt index 748748e939..10ac9f2113 100644 --- a/storage/kvstore/CMakeLists.txt +++ b/storage/kvstore/CMakeLists.txt @@ -1,31 +1,21 @@ # Copyright (c) 2020 ARM Limited. All rights reserved. # SPDX-License-Identifier: Apache-2.0 +add_subdirectory(direct_access_devicekey) +add_subdirectory(kv_config) +add_subdirectory(securestore) + target_include_directories(mbed-os PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/conf - ${CMAKE_CURRENT_SOURCE_DIR}/direct_access_devicekey - ${CMAKE_CURRENT_SOURCE_DIR}/filesystemstore - ${CMAKE_CURRENT_SOURCE_DIR}/global_api + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/kv_map - ${CMAKE_CURRENT_SOURCE_DIR}/securestore - ${CMAKE_CURRENT_SOURCE_DIR}/tdbstore + ${CMAKE_CURRENT_SOURCE_DIR}/include/kvstore ) target_sources(mbed-os PRIVATE - conf/kv_config.cpp - - direct_access_devicekey/DirectAccessDevicekey.cpp - - filesystemstore/FileSystemStore.cpp - - global_api/kvstore_global_api.cpp - - kv_map/KVMap.cpp - - securestore/SecureStore.cpp - - tdbstore/TDBStore.cpp + source/FileSystemStore.cpp + source/KVMap.cpp + source/TDBStore.cpp + source/kvstore_global_api.cpp ) diff --git a/storage/kvstore/direct_access_devicekey/CMakeLists.txt b/storage/kvstore/direct_access_devicekey/CMakeLists.txt new file mode 100644 index 0000000000..267f217acd --- /dev/null +++ b/storage/kvstore/direct_access_devicekey/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +target_include_directories(mbed-os + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/direct_access_devicekey +) + +target_sources(mbed-os + PRIVATE + source/DirectAccessDevicekey.cpp +) diff --git a/storage/kvstore/kv_config/CMakeLists.txt b/storage/kvstore/kv_config/CMakeLists.txt new file mode 100644 index 0000000000..fd1e6dcf69 --- /dev/null +++ b/storage/kvstore/kv_config/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +target_include_directories(mbed-os + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/kv_config +) + +target_sources(mbed-os + PRIVATE + source/kv_config.cpp +) diff --git a/storage/kvstore/securestore/CMakeLists.txt b/storage/kvstore/securestore/CMakeLists.txt new file mode 100644 index 0000000000..81993a8303 --- /dev/null +++ b/storage/kvstore/securestore/CMakeLists.txt @@ -0,0 +1,14 @@ +# Copyright (c) 2020 ARM Limited. All rights reserved. +# SPDX-License-Identifier: Apache-2.0 + +target_include_directories(mbed-os + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/securestore +) + +target_sources(mbed-os + PRIVATE + source/SecureStore.cpp +)