From 543b3bfa44b001f0dab1f39369dc3acc89b5fd34 Mon Sep 17 00:00:00 2001
From: Oxore <oxore@protonmail.com>
Date: Sun, 18 Apr 2021 18:58:26 +0300
Subject: [PATCH 1/3] Add CMakeLists.txt for Mbed CLI v2

---
 CMakeLists.txt | 37 +++++++++++++++++++++++++++++++++++++
 README.md      | 16 ++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..d558452
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,37 @@
+add_library(mbed-mqtt INTERFACE)
+
+target_include_directories(mbed-mqtt
+    INTERFACE
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/
+        ./paho_mqtt-sn_embedded_c/MQTTSNClient/src/
+        ./paho_mqtt_embedded_c/MQTTPacket/src/
+        ./paho_mqtt_embedded_c/MQTTClient/src/
+        ./paho_mqtt_embedded_c/MQTTClient/src/mbed/
+        ./src/
+)
+
+target_sources(mbed-mqtt
+    INTERFACE
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNSerializePublish.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNSubscribeServer.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNUnsubscribeServer.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNPacket.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNConnectServer.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNSearchClient.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNUnsubscribeClient.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNSubscribeClient.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNSearchServer.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNConnectClient.c
+        ./paho_mqtt-sn_embedded_c/MQTTSNPacket/src/MQTTSNDeserializePublish.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTSerializePublish.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTConnectServer.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTConnectClient.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTDeserializePublish.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTUnsubscribeServer.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTPacket.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTUnsubscribeClient.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTSubscribeClient.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTSubscribeServer.c
+        ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTFormat.c
+        ./src/MQTTClientMbedOs.cpp
+)
diff --git a/README.md b/README.md
index d0f11b6..f26aaa2 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,22 @@ See [mbed_lib.json](mbed_lib.json) for all configurable options.
 
 See [test README](TESTS/mqtt/README.md) to find out about tests-specific configuration configuration.
 
+### Building with CLI V2
+
+Assuming you have this repository cloned or somehow available at the `<your-project-root>/mbed-mqtt` directory.
+
+Add to your project's `CMakeLists.txt` file the following lines:
+
+```
+add_subdirectory(mbed-mqtt)
+
+target_link_libraries(${APP_TARGET} mbed-mqtt)
+target_link_libraries(${APP_TARGET} mbed-mbedtls)
+target_link_libraries(${APP_TARGET} mbed-nanostack)
+target_link_libraries(${APP_TARGET} mbed-greentea)
+
+```
+
 ### API and usage
 
 Mbed-os uses [Eclipse paho project emmbedded c implementation of MQTT protocol](https://github.com/eclipse/paho.mqtt.embedded-c) and [MQTT-SN protocol](https://github.com/eclipse/paho.mqtt-sn.embedded-c/).

From 0758348675c8cf945161bdc3b0858b284bfb5843 Mon Sep 17 00:00:00 2001
From: Oxore <oxore@protonmail.com>
Date: Tue, 18 May 2021 21:10:07 +0300
Subject: [PATCH 2/3] Add license header

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d558452..a0c9156 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 add_library(mbed-mqtt INTERFACE)
 
 target_include_directories(mbed-mqtt

From 8fdf48407db50bfb5fee6d3ac00950f7a7d29f91 Mon Sep 17 00:00:00 2001
From: Oxore <oxore@protonmail.com>
Date: Tue, 18 May 2021 21:56:03 +0300
Subject: [PATCH 3/3] Declare dependencies explicitly

---
 CMakeLists.txt | 7 +++++++
 README.md      | 7 +++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a0c9156..9ba06c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,3 +38,10 @@ target_sources(mbed-mqtt
         ./paho_mqtt_embedded_c/MQTTPacket/src/MQTTFormat.c
         ./src/MQTTClientMbedOs.cpp
 )
+
+target_link_libraries(mbed-mqtt
+    INTERFACE
+        mbed-os
+        mbed-netsocket
+        mbed-greentea
+)
diff --git a/README.md b/README.md
index f26aaa2..c2f88d3 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,9 @@ Add to your project's `CMakeLists.txt` file the following lines:
 ```
 add_subdirectory(mbed-mqtt)
 
-target_link_libraries(${APP_TARGET} mbed-mqtt)
-target_link_libraries(${APP_TARGET} mbed-mbedtls)
-target_link_libraries(${APP_TARGET} mbed-nanostack)
-target_link_libraries(${APP_TARGET} mbed-greentea)
+target_link_libraries(${APP_TARGET}
+    mbed-mqtt
+)
 
 ```