Updates:

* cc.mqtt5.libs - v0.5 * cc.mqtt311.libs - v0.1.1 (new) * cc.mqtt5_client_filter.cc_tools_plugin - v0.5. * cc.mqtt311_client_filter.cc_tools_plugin - v0.1 (new)
commschamp · Apr 29, 2024 · b81efc8 · b81efc8
1 parent d10cba1
commit b81efc8
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,7 @@ option (OPT_CC_MQTT5_GENERATED "Forcefully add cc.mqtt5.generated" OFF)
 option (OPT_CC_UBLOX_GENERATED "Forcefully add cc.ublox.generated" OFF)
 option (OPT_CC_X509_GENERATED "Forcefully add cc.x509.generated" OFF)
 option (OPT_CC_MQTTSN_LIBS "Forcefully add cc.mqttsn.libs" OFF)
+option (OPT_CC_MQTT311_LIBS "Forcefully add cc.mqtt311.libs" OFF)
 option (OPT_CC_MQTT5_LIBS "Forcefully add cc.mqtt5.libs" OFF)
 option (OPT_CC_DEMO1_PROTOCOL_CC_TOOLS_PLUGIN "Forcefully add cc.demo1_protocol.cc_tools_plugin" OFF)
 option (OPT_CC_DEMO2_PROTOCOL_CC_TOOLS_PLUGIN "Forcefully add cc.demo2_protocol.cc_tools_plugin" OFF)
@@ -22,6 +23,7 @@ option (OPT_CC_MQTT311_PROTOCOL_CC_TOOLS_PLUGIN "Forcefully add cc.mqtt311_proto
 option (OPT_CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN "Forcefully add cc.mqtt5_protocol.cc_tools_plugin" OFF)
 option (OPT_CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN "Forcefully add cc.mqttsn_protocol.cc_tools_plugin" OFF)
 option (OPT_CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN "Forcefully add cc.ublox_protocol.cc_tools_plugin" OFF)
+option (OPT_CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN "Forcefully add cc.mqtt311_client_filter.cc_tools_plugin" OFF)
 option (OPT_CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN "Forcefully add cc.mqtt5_client_filter.cc_tools_plugin" OFF)
 option (OPT_ALLOW_BOOST "Build applications requiring boost if the latter is found" ON)
 
@@ -52,6 +54,7 @@ cc_add_project (cc.mqtt5.generated)
 cc_add_project (cc.ublox.generated)
 cc_add_project (cc.x509.generated)
 cc_add_project (cc.mqttsn.libs)
+cc_add_project (cc.mqtt311.libs)
 cc_add_project (cc.mqtt5.libs)
 cc_add_project (cc.demo1_protocol.cc_tools_plugin)
 cc_add_project (cc.demo2_protocol.cc_tools_plugin)
@@ -60,6 +63,7 @@ cc_add_project (cc.mqtt311_protocol.cc_tools_plugin)
 cc_add_project (cc.mqtt5_protocol.cc_tools_plugin)
 cc_add_project (cc.mqttsn_protocol.cc_tools_plugin)
 cc_add_project (cc.ublox_protocol.cc_tools_plugin)
+cc_add_project (cc.mqtt311_client_filter.cc_tools_plugin)
 cc_add_project (cc.mqtt5_client_filter.cc_tools_plugin)
 
 if (WIN32 AND OPT_CC_TOOLS_QT)

diff --git a/DefaultConfig.cmake b/DefaultConfig.cmake
@@ -11,6 +11,7 @@ set (CC_MQTTSN_GENERATED_DEFAULT_TAG "v2.7")
 set (CC_UBLOX_GENERATED_DEFAULT_TAG "v2.7")
 set (CC_X509_GENERATED_DEFAULT_TAG "v0.7")
 set (CC_MQTTSN_LIBS_DEFAULT_TAG "v1.0.8")
+set (CC_MQTT311_LIBS_DEFAULT_TAG "v0.1.1")
 set (CC_MQTT5_LIBS_DEFAULT_TAG "v0.4")
 set (CC_DEMO1_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_DEMO1_GENERATED_DEFAULT_TAG}")
 set (CC_DEMO2_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_DEMO2_GENERATED_DEFAULT_TAG}")
@@ -19,6 +20,7 @@ set (CC_MQTT311_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_MQTT311_GENERATED_DEF
 set (CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_MQTT5_GENERATED_DEFAULT_TAG}")
 set (CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_MQTTSN_GENERATED_DEFAULT_TAG}")
 set (CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_UBLOX_GENERATED_DEFAULT_TAG}")
+set (CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_TAG "v0.1")
 set (CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_TAG "v0.4")
 set (QT_MAJOR_DEFAULT_VERSION 5)
 
@@ -35,6 +37,7 @@ list (APPEND CC_MQTTSN_GENERATED_DEPENDS comms)
 list (APPEND CC_UBLOX_GENERATED_DEPENDS comms)
 list (APPEND CC_X509_GENERATED_DEPENDS comms)
 list (APPEND CC_MQTTSN_LIBS_DEPENDS cc.mqttsn.generated cc.mqtt311.generated comms)
+list (APPEND CC_MQTT311_LIBS_DEPENDS cc.mqtt311.generated comms)
 list (APPEND CC_MQTT5_LIBS_DEPENDS cc.mqtt5.generated comms)
 list (APPEND CC_DEMO1_PROTOCOL_CC_TOOLS_PLUGIN_DEPENDS cc.demo1.generated cc_tools_qt)
 list (APPEND CC_DEMO2_PROTOCOL_CC_TOOLS_PLUGIN_DEPENDS cc.demo2.generated cc_tools_qt)
@@ -43,11 +46,17 @@ list (APPEND CC_MQTT311_PROTOCOL_CC_TOOLS_PLUGIN_DEPENDS cc.mqtt311.generated cc
 list (APPEND CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN_DEPENDS cc.mqtt5.generated cc_tools_qt)
 list (APPEND CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN_DEPENDS cc.mqttsn.generated cc_tools_qt)
 list (APPEND CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN_DEPENDS cc.ublox.generated cc_tools_qt)
+list (APPEND CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEPENDS cc.mqtt311.libs cc_tools_qt)
 list (APPEND CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEPENDS cc.mqtt5.libs cc_tools_qt)
 
 ########################################################################
 
 # Extra flags
+if (OPT_CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN)
+    # cc.mqtt311.libs requires PIC compilation when linked to the shared module.
+    list (APPEND CC_MQTT311_LIBS_DEFAULT_CMAKE_ARGS -DCC_MQTT311_CLIENT_LIB_FORCE_PIC=ON)
+endif ()
+
 if (OPT_CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
     # cc.mqtt5.libs requires PIC compilation when linked to the shared module.
     list (APPEND CC_MQTT5_LIBS_DEFAULT_CMAKE_ARGS -DCC_MQTT5_CLIENT_LIB_FORCE_PIC=ON)
@@ -82,10 +91,12 @@ if (OPT_ALLOW_BOOST)
         add_boost_param(Boost_USE_STATIC_RUNTIME)
         add_boost_param(Boost_LIB_PREFIX)
 
+        list (APPEND CC_MQTT311_LIBS_DEFAULT_CMAKE_ARGS ${boost_params})
         list (APPEND CC_MQTT5_LIBS_DEFAULT_CMAKE_ARGS ${boost_params})
     endif ()
 endif ()
 
+list (APPEND CC_MQTT311_LIBS_DEFAULT_CMAKE_ARGS -DCC_MQTT311_CLIENT_APPS=${boost_enabled})
 list (APPEND CC_MQTT5_LIBS_DEFAULT_CMAKE_ARGS -DCC_MQTT5_CLIENT_APPS=${boost_enabled})
 
 ########################################################################
@@ -103,11 +114,12 @@ list (APPEND CC_MQTT311_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJ
 list (APPEND CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJOR_VERSION=${OPT_QT_MAJOR_VERSION})
 list (APPEND CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJOR_VERSION=${OPT_QT_MAJOR_VERSION})
 list (APPEND CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJOR_VERSION=${OPT_QT_MAJOR_VERSION})
+list (APPEND CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJOR_VERSION=${OPT_QT_MAJOR_VERSION})
 list (APPEND CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJOR_VERSION=${OPT_QT_MAJOR_VERSION})
 
 ########################################################################
 
 # C++ standard
 if ("${CMAKE_CXX_STANDARD}" STREQUAL "")
     set (CMAKE_CXX_STANDARD 17)
-endif ()
+endif ()
diff --git a/config/All.cmake b/config/All.cmake
@@ -16,6 +16,7 @@ enalbe_if_opt_not_set (OPT_CC_MQTTSN_GENERATED)
 enalbe_if_opt_not_set (OPT_CC_UBLOX_GENERATED)
 enalbe_if_opt_not_set (OPT_CC_X509_GENERATED)
 enalbe_if_opt_not_set (OPT_CC_MQTTSN_LIBS)
+enalbe_if_opt_not_set (OPT_CC_MQTT311_LIBS)
 enalbe_if_opt_not_set (OPT_CC_MQTT5_LIBS)
 enalbe_if_opt_not_set (OPT_CC_DEMO1_PROTOCOL_CC_TOOLS_PLUGIN)
 enalbe_if_opt_not_set (OPT_CC_DEMO2_PROTOCOL_CC_TOOLS_PLUGIN)
@@ -24,4 +25,5 @@ enalbe_if_opt_not_set (OPT_CC_MQTT311_PROTOCOL_CC_TOOLS_PLUGIN)
 enalbe_if_opt_not_set (OPT_CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN)
 enalbe_if_opt_not_set (OPT_CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN)
 enalbe_if_opt_not_set (OPT_CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN)
+enalbe_if_opt_not_set (OPT_CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN)
 enalbe_if_opt_not_set (OPT_CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
diff --git a/config/AllDevelop.cmake b/config/AllDevelop.cmake
@@ -18,6 +18,7 @@ set_develop_branch (CC_MQTTSN_GENERATED)
 set_develop_branch (CC_UBLOX_GENERATED)
 set_develop_branch (CC_X509_GENERATED)
 set_develop_branch (CC_MQTTSN_LIBS)
+set_develop_branch (CC_MQTT311_LIBS)
 set_develop_branch (CC_MQTT5_LIBS)
 set_develop_branch (CC_DEMO1_PROTOCOL_CC_TOOLS_PLUGIN)
 set_develop_branch (CC_DEMO2_PROTOCOL_CC_TOOLS_PLUGIN)
@@ -26,4 +27,5 @@ set_develop_branch (CC_MQTT311_PROTOCOL_CC_TOOLS_PLUGIN)
 set_develop_branch (CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN)
 set_develop_branch (CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN)
 set_develop_branch (CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN)
+set_develop_branch (CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN)
 set_develop_branch (CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
diff --git a/config/AllExceptTools.cmake b/config/AllExceptTools.cmake
@@ -15,4 +15,5 @@ enalbe_if_opt_not_set (OPT_CC_MQTTSN_GENERATED)
 enalbe_if_opt_not_set (OPT_CC_UBLOX_GENERATED)
 enalbe_if_opt_not_set (OPT_CC_X509_GENERATED)
 enalbe_if_opt_not_set (OPT_CC_MQTTSN_LIBS)
+enalbe_if_opt_not_set (OPT_CC_MQTT311_LIBS)
 enalbe_if_opt_not_set (OPT_CC_MQTT5_LIBS)
diff --git a/config/AllLibs.cmake b/config/AllLibs.cmake
@@ -5,4 +5,5 @@ macro (enalbe_if_opt_not_set name)
 endmacro()
 
 enalbe_if_opt_not_set (OPT_CC_MQTTSN_LIBS)
+enalbe_if_opt_not_set (OPT_CC_MQTT311_LIBS)
 enalbe_if_opt_not_set (OPT_CC_MQTT5_LIBS)
diff --git a/config/AllTools.cmake b/config/AllTools.cmake
@@ -12,4 +12,5 @@ enalbe_if_opt_not_set (OPT_CC_MQTT311_PROTOCOL_CC_TOOLS_PLUGIN)
 enalbe_if_opt_not_set (OPT_CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN)
 enalbe_if_opt_not_set (OPT_CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN)
 enalbe_if_opt_not_set (OPT_CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN)
+enalbe_if_opt_not_set (OPT_CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN)
 enalbe_if_opt_not_set (OPT_CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)