From e744208c07a0609b8c6d9e9dbaa88fbfd26ecee1 Mon Sep 17 00:00:00 2001
From: Hugues Kamba <hugues.kamba@arm.com>
Date: Wed, 5 Aug 2020 13:43:01 +0100
Subject: [PATCH] CMake: Fix build failure due to drivers and lwipstack dirs
 move

---
 connectivity/CMakeLists.txt                   |  1 +
 .../lwipstack/CMakeLists.txt                  | 37 ++++++++---------
 drivers/CMakeLists.txt                        | 40 ++++++++++++++-----
 features/CMakeLists.txt                       |  1 -
 4 files changed, 49 insertions(+), 30 deletions(-)
 rename {features => connectivity}/lwipstack/CMakeLists.txt (79%)

diff --git a/connectivity/CMakeLists.txt b/connectivity/CMakeLists.txt
index 8f292729f2..8753fa2ab8 100644
--- a/connectivity/CMakeLists.txt
+++ b/connectivity/CMakeLists.txt
@@ -4,4 +4,5 @@
 add_subdirectory(cellular)
 add_subdirectory(drivers)
 add_subdirectory(libraries)
+add_subdirectory(lwipstack)
 add_subdirectory(netsocket)
diff --git a/features/lwipstack/CMakeLists.txt b/connectivity/lwipstack/CMakeLists.txt
similarity index 79%
rename from features/lwipstack/CMakeLists.txt
rename to connectivity/lwipstack/CMakeLists.txt
index 6fe6b33fd9..e51efafa60 100644
--- a/features/lwipstack/CMakeLists.txt
+++ b/connectivity/lwipstack/CMakeLists.txt
@@ -1,5 +1,17 @@
+# 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/lwipstack
+        ${CMAKE_CURRENT_SOURCE_DIR}/lwip/src/include
+        ${CMAKE_CURRENT_SOURCE_DIR}/lwip/src/include/lwip
+        ${CMAKE_CURRENT_SOURCE_DIR}/lwip-sys
+        ${CMAKE_CURRENT_SOURCE_DIR}/lwip-sys/arch
+)
+
 target_sources(mbed-os
     PRIVATE
         lwip/src/api/lwip_api_lib.c
@@ -66,22 +78,11 @@ target_sources(mbed-os
         lwip-sys/lwip_random.c
         lwip-sys/lwip_tcp_isn.c
 
-        LWIPInterface.cpp
-        LWIPInterfaceEMAC.cpp
-        LWIPInterfaceL3IP.cpp
-        LWIPInterfacePPP.cpp
-        LWIPMemoryManager.cpp
-        LWIPStack.cpp
-        lwip_tools.cpp
+        source/LWIPInterface.cpp
+        source/LWIPInterfaceEMAC.cpp
+        source/LWIPInterfaceL3IP.cpp
+        source/LWIPInterfacePPP.cpp
+        source/LWIPMemoryManager.cpp
+        source/LWIPStack.cpp
+        source/lwip_tools.cpp
 )
-
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        lwip/src/include
-        lwip/src/include/lwip
-        lwip-sys
-        lwip-sys/arch
-)
-
-mbed_add_cmake_directory_if_labels("COMPONENT")
diff --git a/drivers/CMakeLists.txt b/drivers/CMakeLists.txt
index 8698d54d73..e32af65e0e 100644
--- a/drivers/CMakeLists.txt
+++ b/drivers/CMakeLists.txt
@@ -1,5 +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/drivers
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/drivers/internal
+)
+
 target_sources(mbed-os
     PRIVATE
         source/AnalogIn.cpp
@@ -23,25 +32,34 @@ target_sources(mbed-os
         source/PwmOut.cpp
         source/QSPI.cpp
         source/ResetReason.cpp
-        source/SerialBase.cpp
-        source/SerialWireOutput.cpp
         source/SFDP.cpp
         source/SPI.cpp
         source/SPISlave.cpp
+        source/SerialBase.cpp
+        source/SerialWireOutput.cpp
         source/Ticker.cpp
         source/Timeout.cpp
         source/Timer.cpp
         source/TimerEvent.cpp
         source/UnbufferedSerial.cpp
         source/Watchdog.cpp
-        source/Watchdog.cpp
-)
 
-target_include_directories(mbed-os
-    PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-)
-target_include_directories(mbed-os
-    PUBLIC
-        internal
+        source/usb/AsyncOp.cpp
+        source/usb/ByteBuffer.cpp
+        source/usb/EndpointResolver.cpp
+        source/usb/LinkedListBase.cpp
+        source/usb/OperationListBase.cpp
+        source/usb/PolledQueue.cpp
+        source/usb/TaskBase.cpp
+        source/usb/USBAudio.cpp
+        source/usb/USBCDC.cpp
+        source/usb/USBCDC_ECM.cpp
+        source/usb/USBDevice.cpp
+        source/usb/USBHID.cpp
+        source/usb/USBKeyboard.cpp
+        source/usb/USBMIDI.cpp
+        source/usb/USBMSD.cpp
+        source/usb/USBMouse.cpp
+        source/usb/USBMouseKeyboard.cpp
+        source/usb/USBSerial.cpp
 )
diff --git a/features/CMakeLists.txt b/features/CMakeLists.txt
index 0bd8ece2c1..016d5cfbd4 100644
--- a/features/CMakeLists.txt
+++ b/features/CMakeLists.txt
@@ -9,7 +9,6 @@ add_subdirectory(frameworks/mbed-client-randlib)
 add_subdirectory(frameworks/mbed-trace)
 add_subdirectory(frameworks/mbed-client-cli)
 add_subdirectory(lorawan)
-add_subdirectory(lwipstack)
 add_subdirectory(mbedtls)
 add_subdirectory(nanostack)
 add_subdirectory(nfc)