CMake: Fix build failure due to lora, cryptocell, and nfc dirs move

components/CMakeLists.txt

@@ -1,5 +1,4 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(lora)
 add_subdirectory(testing)

connectivity/CMakeLists.txt

@@ -6,7 +6,14 @@ mbed_add_cmake_directory_if_labels("FEATURE")
 add_subdirectory(cellular)
 add_subdirectory(drivers)
 add_subdirectory(libraries)
+add_subdirectory(lorawan)
 add_subdirectory(lwipstack)
 add_subdirectory(mbedtls)
 add_subdirectory(nanostack)
 add_subdirectory(netsocket)
+add_subdirectory(nfc)
+
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)

connectivity/drivers/CMakeLists.txt

@@ -5,5 +5,7 @@ add_subdirectory(802.15.4_RF)
 add_subdirectory(ble)
 add_subdirectory(cellular)
 add_subdirectory(emac)
+add_subdirectory(lora)
 add_subdirectory(mbedtls)
+add_subdirectory(nfc)
 add_subdirectory(wifi)

connectivity/drivers/mbedtls/CMakeLists.txt

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

connectivity/drivers/mbedtls/FEATURE_CRYPTOCELL310/CMakeLists.txt

@@ -0,0 +1,27 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+mbed_add_cmake_directory_if_labels("TARGET")
+add_subdirectory(binaries)
+
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/cryptocell310
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/internal
+)
+
+target_sources(mbed-os
+    PRIVATE
+        source/aes_alt.c
+        source/cc_internal.c
+        source/ccm_alt.c
+        source/cmac_alt.c
+        source/ecdh_alt.c
+        source/ecdsa_alt.c
+        source/sha1_alt.c
+        source/sha256_alt.c
+        source/sha512_alt.c
+        source/trng.c
+)

connectivity/drivers/nfc/CMakeLists.txt

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

connectivity/drivers/nfc/PN512/CMakeLists.txt

@@ -0,0 +1,28 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/nfc
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/nfc/controllers
+        ${CMAKE_CURRENT_SOURCE_DIR}/source
+        ${CMAKE_CURRENT_SOURCE_DIR}/source/transceiver
+)
+
+target_sources(mbed-os
+    PRIVATE
+        source/PN512Driver.cpp
+        source/PN512SPITransportDriver.cpp
+        source/PN512TransportDriver.cpp
+
+        source/transceiver/pn512.c
+        source/transceiver/pn512_cmd.c
+        source/transceiver/pn512_hw.c
+        source/transceiver/pn512_irq.c
+        source/transceiver/pn512_poll.c
+        source/transceiver/pn512_registers.c
+        source/transceiver/pn512_rf.c
+        source/transceiver/pn512_timer.c
+        source/transceiver/pn512_transceive.c
+)

connectivity/lorawan/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(lorastack)
+add_subdirectory(system)
+
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/lorawan
+)
+
+target_sources(mbed-os
+    PRIVATE
+        source/LoRaWANInterface.cpp
+        source/LoRaWANStack.cpp
+)

connectivity/lorawan/lorastack/CMakeLists.txt

@@ -1,6 +1,13 @@
 # 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}/mac
+        ${CMAKE_CURRENT_SOURCE_DIR}/phy
+)
+
 target_sources(mbed-os
     PRIVATE
         mac/LoRaMac.cpp
@@ -19,10 +26,3 @@ target_sources(mbed-os
         phy/LoRaPHYKR920.cpp
         phy/LoRaPHYUS915.cpp
 )
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/mac
-        ${CMAKE_CURRENT_SOURCE_DIR}/phy
-)

connectivity/nfc/CMakeLists.txt

@@ -0,0 +1,36 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory(libraries)
+
+target_include_directories(mbed-os
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/nfc
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/nfc/ndef
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/nfc/ndef/common
+)
+
+target_sources(mbed-os
+    PRIVATE
+        source/NFCController.cpp
+        source/NFCControllerDriver.cpp
+        source/NFCEEPROM.cpp
+        source/NFCEEPROMDriver.cpp
+        source/NFCNDEFCapable.cpp
+        source/NFCRemoteEndpoint.cpp
+        source/NFCRemoteInitiator.cpp
+        source/NFCTarget.cpp
+        source/Type4RemoteInitiator.cpp
+
+        source/ndef/MessageBuilder.cpp
+        source/ndef/MessageParser.cpp
+        source/ndef/RecordParser.cpp
+
+        source/ndef/common/Mime.cpp
+        source/ndef/common/SimpleMessageParser.cpp
+        source/ndef/common/Text.cpp
+        source/ndef/common/URI.cpp
+        source/ndef/common/util.cpp
+)

connectivity/nfc/libraries/CMakeLists.txt

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

connectivity/nfc/libraries/stack/transceiver/CMakeLists.txt

@@ -1,16 +1,12 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-add_subdirectory(lorastack)
-add_subdirectory(system)
-
-target_sources(mbed-os
-    PRIVATE
-        LoRaWANInterface.cpp
-        LoRaWANStack.cpp
-)
-
 target_include_directories(mbed-os
     PUBLIC
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
+
+target_sources(mbed-os
+    PRIVATE
+        transceiver.c
+)

features/CMakeLists.txt

@@ -3,13 +3,10 @@
 
 mbed_add_cmake_directory_if_labels("FEATURE")
 
-add_subdirectory(cryptocell)
 add_subdirectory(device_key)
 add_subdirectory(frameworks/mbed-client-randlib)
 add_subdirectory(frameworks/mbed-trace)
 add_subdirectory(frameworks/mbed-client-cli)
-add_subdirectory(lorawan)
-add_subdirectory(nfc)
 
 target_include_directories(mbed-os
     PUBLIC

features/cryptocell/FEATURE_CRYPTOCELL310/CMakeLists.txt

@@ -1,25 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-mbed_add_cmake_directory_if_labels("TARGET")
-add_subdirectory(binaries)
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
-target_sources(mbed-os
-    PRIVATE
-        aes_alt.c
-        cc_internal.c
-        ccm_alt.c
-        cmac_alt.c
-        ecdh_alt.c
-        ecdsa_alt.c
-        sha1_alt.c
-        sha256_alt.c
-        sha512_alt.c
-        trng.c
-)

features/nfc/CMakeLists.txt

@@ -1,41 +0,0 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-add_subdirectory(acore)
-add_subdirectory(stack)
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/controllers
-        ${CMAKE_CURRENT_SOURCE_DIR}/nfc
-        ${CMAKE_CURRENT_SOURCE_DIR}/nfc/ndef
-        ${CMAKE_CURRENT_SOURCE_DIR}/nfc/ndef/common
-)
-
-target_sources(mbed-os
-    PRIVATE
-        source/controllers/PN512Driver.cpp
-        source/controllers/PN512SPITransportDriver.cpp
-        source/controllers/PN512TransportDriver.cpp
-
-        source/nfc/NFCController.cpp
-        source/nfc/NFCControllerDriver.cpp
-        source/nfc/NFCEEPROM.cpp
-        source/nfc/NFCEEPROMDriver.cpp
-        source/nfc/NFCNDEFCapable.cpp
-        source/nfc/NFCRemoteEndpoint.cpp
-        source/nfc/NFCRemoteInitiator.cpp
-        source/nfc/NFCTarget.cpp
-        source/nfc/Type4RemoteInitiator.cpp
-
-        source/nfc/ndef/MessageBuilder.cpp
-        source/nfc/ndef/MessageParser.cpp
-        source/nfc/ndef/RecordParser.cpp
-
-        source/nfc/ndef/common/Mime.cpp
-        source/nfc/ndef/common/SimpleMessageParser.cpp
-        source/nfc/ndef/common/Text.cpp
-        source/nfc/ndef/common/URI.cpp
-        source/nfc/ndef/common/util.cpp
-)

features/nfc/stack/transceiver/CMakeLists.txt

@@ -1,23 +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}
-        ${CMAKE_CURRENT_SOURCE_DIR}/pn512
-)
-
-target_sources(mbed-os
-    PRIVATE
-        transceiver.c
-
-        pn512/pn512.c
-        pn512/pn512_cmd.c
-        pn512/pn512_hw.c
-        pn512/pn512_irq.c
-        pn512/pn512_poll.c
-        pn512/pn512_registers.c
-        pn512/pn512_rf.c
-        pn512/pn512_timer.c
-        pn512/pn512_transceive.c
-)