CMake: Fix failures due to device_key and storage dirs move

drivers/CMakeLists.txt

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

drivers/device_key/CMakeLists.txt

@@ -2,11 +2,12 @@
 # SPDX-License-Identifier: Apache-2.0
 
 target_include_directories(mbed-os
-	PUBLIC
-		source
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/device_key
 )
 
 target_sources(mbed-os
-	PRIVATE
-		source/DeviceKey.cpp
+    PRIVATE
+        source/DeviceKey.cpp
 )

features/CMakeLists.txt

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

storage/blockdevice/COMPONENT_FLASHIAP/CMakeLists.txt

@@ -1,12 +1,14 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_sources(mbed-os
-    PRIVATE
-        FlashIAPBlockDevice.cpp
-)
-
 target_include_directories(mbed-os
     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
 )

storage/blockdevice/COMPONENT_QSPIF/CMakeLists.txt

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