CMake: Fix failure due to kvstore and cellular dirs changes

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)

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
+)

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
+)

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)

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
+)

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
+)

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("")

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)

features/cellular/framework/API/CMakeLists.txt

@@ -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}
-)

features/cellular/framework/AT/CMakeLists.txt

@@ -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
-)

features/cellular/framework/common/CMakeLists.txt

@@ -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
-)

features/cellular/framework/device/CMakeLists.txt

@@ -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
-)

features/cellular/framework/targets/UBLOX/CMakeLists.txt

@@ -1,4 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-mbed_add_cmake_directory_if_labels("")

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
 )

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
+)

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
+)

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
+)