Skip to content

Commit d48305d

Browse files
committed
Using v2.8 of cc.mqtt5.commsdsl to generate current code.
1 parent c6ac60a commit d48305d

72 files changed

Lines changed: 88 additions & 73 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CMakeLists.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ cmake_minimum_required (VERSION 3.10)
22
project ("cc_mqtt5_cc_tools_qt_plugin")
33

44
# Build options:
5+
option (OPT_WARN_AS_ERR "Treat warnings as errors" ON)
6+
option (OPT_USE_CCACHE "Use ccache" OFF)
57
option (OPT_INSTALL_DEFAULT_CONFIG "Install default plugin configuration" ON)
68

79
# Configuration variables:
810
# OPT_QT_MAJOR_VERSION - The major Qt version, defaults to 5
11+
# OPT_CCACHE_EXECUTABLE - Custom ccache executable
912

1013
######################################################################
1114

@@ -30,8 +33,20 @@ set (CMAKE_AUTOMOC ON)
3033
set (CMAKE_AUTOUIC ON)
3134
set (CMAKE_AUTORCC ON)
3235

36+
set (extra_opts)
37+
if (OPT_WARN_AS_ERR)
38+
list(APPEND extra_opts WARN_AS_ERR)
39+
endif()
40+
41+
if (OPT_USE_CCACHE)
42+
list(APPEND extra_opts USE_CCACHE)
43+
if (NOT "${OPT_CCACHE_EXECUTABLE}" STREQUAL "")
44+
list(APPEND extra_opts CCACHE_EXECUTABLE "${OPT_CCACHE_EXECUTABLE}")
45+
endif()
46+
endif()
47+
3348
include(${LibComms_DIR}/CC_Compile.cmake)
34-
cc_compile(WARN_AS_ERR)
49+
cc_compile(${extra_opts})
3550
cc_msvc_force_warn_opt(/W4)
3651

3752
include(GNUInstallDirs)

cc_tools_qt_plugin/cc_mqtt5/Message.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#include "Message.h"
44

cc_tools_qt_plugin/cc_mqtt5/Message.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

55
#include "cc_tools_qt/version.h"
66

7-
static_assert(CC_TOOLS_QT_MAKE_VERSION(5, 2, 1) <= cc_tools_qt::version(),
7+
static_assert(CC_TOOLS_QT_MAKE_VERSION(5, 3, 1) <= cc_tools_qt::version(),
88
"The version of cc_tools_qt library is too old");

cc_tools_qt_plugin/cc_mqtt5/factory/AllMessagesDynMemMsgFactory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#include "cc_mqtt5/MsgId.h"
44
#include "cc_tools_qt_plugin/cc_mqtt5/factory/AllMessagesDynMemMsgFactory.h"

cc_tools_qt_plugin/cc_mqtt5/factory/AllMessagesDynMemMsgFactory.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

cc_tools_qt_plugin/cc_mqtt5/field/BinData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#include "BinData.h"
44

cc_tools_qt_plugin/cc_mqtt5/field/BinData.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

cc_tools_qt_plugin/cc_mqtt5/field/EnableEnum.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#include "EnableEnum.h"
44

cc_tools_qt_plugin/cc_mqtt5/field/EnableEnum.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Generated by commsdsl2tools_qt v6.3.2
1+
// Generated by commsdsl2tools_qt v6.3.3
22

33
#pragma once
44

0 commit comments

Comments
 (0)