Skip to content

Commit c6da517

Browse files
arobenkoarobenko
committed
Release 2024-09-06
2 parents 8d49c1d + 73aa3fa commit c6da517

File tree

8 files changed

+22
-122
lines changed

8 files changed

+22
-122
lines changed

‎.appveyor.yml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎.github/workflows/actions_build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
run: |
132132
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
133133
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
134-
-DBoost_USE_STATIC_LIBS=ON ^
134+
-DCMAKE_POLICY_DEFAULT_CMP0167=OLD -DBoost_USE_STATIC_LIBS=ON ^
135135
-DCMAKE_PROJECT_INCLUDE=config/All.cmake -DOPT_QT_MAJOR_VERSION=${{matrix.qt_ver}} ^
136136
-DOPT_CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN=OFF
137137
env:

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ cc_add_project (cc.mqttsn_protocol.cc_tools_plugin)
6565
cc_add_project (cc.ublox_protocol.cc_tools_plugin)
6666
cc_add_project (cc.mqtt311_client_filter.cc_tools_plugin)
6767
cc_add_project (cc.mqtt5_client_filter.cc_tools_plugin)
68+
cc_add_project (cc.mqttsn_client_filter.cc_tools_plugin)
6869

6970
if (WIN32 AND OPT_CC_TOOLS_QT)
7071
add_custom_target ("deploy_qt"

‎DefaultConfig.cmake‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Default versions
2-
set (COMMS_DEFAULT_TAG "v5.2.5")
3-
set (CC_TOOLS_QT_DEFAULT_TAG "v5.3.1")
2+
set (COMMS_DEFAULT_TAG "v5.2.6")
3+
set (CC_TOOLS_QT_DEFAULT_TAG "v5.3.2")
44
set (COMMSDSL_DEFAULT_TAG "v6.3.3")
55
set (CC_DEMO1_GENERATED_DEFAULT_TAG "v2.8")
66
set (CC_DEMO2_GENERATED_DEFAULT_TAG "v2.8")
77
set (CC_DEMO3_GENERATED_DEFAULT_TAG "v2.8")
88
set (CC_MQTT311_GENERATED_DEFAULT_TAG "v2.8")
99
set (CC_MQTT5_GENERATED_DEFAULT_TAG "v2.8")
10-
set (CC_MQTTSN_GENERATED_DEFAULT_TAG "v2.8")
10+
set (CC_MQTTSN_GENERATED_DEFAULT_TAG "v2.8.1")
1111
set (CC_UBLOX_GENERATED_DEFAULT_TAG "v2.8")
1212
set (CC_X509_GENERATED_DEFAULT_TAG "v1.0")
13-
set (CC_MQTTSN_LIBS_DEFAULT_TAG "v1.0.8")
13+
set (CC_MQTTSN_LIBS_DEFAULT_TAG "v2.0.3")
1414
set (CC_MQTT311_LIBS_DEFAULT_TAG "v1.0")
1515
set (CC_MQTT5_LIBS_DEFAULT_TAG "v1.0")
1616
set (CC_DEMO1_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_DEMO1_GENERATED_DEFAULT_TAG}")
@@ -22,6 +22,7 @@ set (CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_MQTTSN_GENERATED_DEFAU
2222
set (CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_TAG "${CC_UBLOX_GENERATED_DEFAULT_TAG}")
2323
set (CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_TAG "v0.2")
2424
set (CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_TAG "v0.6")
25+
set (CC_MQTTSN_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_TAG "v0.1")
2526
set (QT_MAJOR_DEFAULT_VERSION 5)
2627

2728
########################################################################
@@ -48,6 +49,7 @@ list (APPEND CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN_DEPENDS cc.mqttsn.generated cc_t
4849
list (APPEND CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN_DEPENDS cc.ublox.generated cc_tools_qt)
4950
list (APPEND CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEPENDS cc.mqtt311.libs cc_tools_qt)
5051
list (APPEND CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEPENDS cc.mqtt5.libs cc_tools_qt)
52+
list (APPEND CC_MQTTSN_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEPENDS cc.mqttsn.libs cc_tools_qt)
5153

5254
########################################################################
5355

@@ -62,6 +64,11 @@ if (OPT_CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
6264
list (APPEND CC_MQTT5_LIBS_DEFAULT_CMAKE_ARGS -DCC_MQTT5_CLIENT_LIB_FORCE_PIC=ON)
6365
endif ()
6466

67+
if (OPT_CC_MQTTSN_CLIENT_FILTER_CC_TOOLS_PLUGIN)
68+
# cc.mqttsn.libs requires PIC compilation when linked to the shared module.
69+
list (APPEND CC_MQTTSN_LIBS_DEFAULT_CMAKE_ARGS -DCC_MQTTSN_CLIENT_LIB_FORCE_PIC=ON)
70+
endif ()
71+
6572
########################################################################
6673

6774
# Boost configuration
@@ -90,14 +97,17 @@ if (OPT_ALLOW_BOOST)
9097
add_boost_param(Boost_USE_STATIC_LIBS)
9198
add_boost_param(Boost_USE_STATIC_RUNTIME)
9299
add_boost_param(Boost_LIB_PREFIX)
100+
add_boost_param(CMAKE_POLICY_DEFAULT_CMP0167)
93101

94102
list (APPEND CC_MQTT311_LIBS_DEFAULT_CMAKE_ARGS ${boost_params})
95103
list (APPEND CC_MQTT5_LIBS_DEFAULT_CMAKE_ARGS ${boost_params})
104+
list (APPEND CC_MQTTSN_LIBS_DEFAULT_CMAKE_ARGS ${boost_params})
96105
endif ()
97106
endif ()
98107

99108
list (APPEND CC_MQTT311_LIBS_DEFAULT_CMAKE_ARGS -DCC_MQTT311_CLIENT_APPS=${boost_enabled})
100109
list (APPEND CC_MQTT5_LIBS_DEFAULT_CMAKE_ARGS -DCC_MQTT5_CLIENT_APPS=${boost_enabled})
110+
list (APPEND CC_MQTTSN_LIBS_DEFAULT_CMAKE_ARGS -DCC_MQTTSN_CLIENT_APPS=${boost_enabled} -DCC_MQTTSN_GATEWAY_APPS=${boost_enabled})
101111

102112
########################################################################
103113

@@ -116,6 +126,7 @@ list (APPEND CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJO
116126
list (APPEND CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJOR_VERSION=${OPT_QT_MAJOR_VERSION})
117127
list (APPEND CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJOR_VERSION=${OPT_QT_MAJOR_VERSION})
118128
list (APPEND CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJOR_VERSION=${OPT_QT_MAJOR_VERSION})
129+
list (APPEND CC_MQTTSN_CLIENT_FILTER_CC_TOOLS_PLUGIN_DEFAULT_CMAKE_ARGS -DOPT_QT_MAJOR_VERSION=${OPT_QT_MAJOR_VERSION})
119130

120131
########################################################################
121132

‎config/All.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ enalbe_if_opt_not_set (OPT_CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN)
2626
enalbe_if_opt_not_set (OPT_CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN)
2727
enalbe_if_opt_not_set (OPT_CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN)
2828
enalbe_if_opt_not_set (OPT_CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN)
29-
enalbe_if_opt_not_set (OPT_CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
29+
enalbe_if_opt_not_set (OPT_CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
30+
enalbe_if_opt_not_set (OPT_CC_MQTTSN_CLIENT_FILTER_CC_TOOLS_PLUGIN)

‎config/AllDevelop.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ set_develop_branch (CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN)
2929
set_develop_branch (CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN)
3030
set_develop_branch (CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN)
3131
set_develop_branch (CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
32+
set_develop_branch (CC_MQTTSN_CLIENT_FILTER_CC_TOOLS_PLUGIN)

‎config/AllTools.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ enalbe_if_opt_not_set (OPT_CC_MQTT5_PROTOCOL_CC_TOOLS_PLUGIN)
1313
enalbe_if_opt_not_set (OPT_CC_MQTTSN_PROTOCOL_CC_TOOLS_PLUGIN)
1414
enalbe_if_opt_not_set (OPT_CC_UBLOX_PROTOCOL_CC_TOOLS_PLUGIN)
1515
enalbe_if_opt_not_set (OPT_CC_MQTT311_CLIENT_FILTER_CC_TOOLS_PLUGIN)
16-
enalbe_if_opt_not_set (OPT_CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
16+
enalbe_if_opt_not_set (OPT_CC_MQTT5_CLIENT_FILTER_CC_TOOLS_PLUGIN)
17+
enalbe_if_opt_not_set (OPT_CC_MQTTSN_CLIENT_FILTER_CC_TOOLS_PLUGIN)

‎script/appveyor_install.bat‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)