Release v6.3.1

commschamp · Mar 26, 2024 · ead79b6 · ead79b6
2 parents 195e614 + 5697dcc
commit ead79b6
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -18,7 +18,7 @@ configuration:
 
 environment:
     COMMS_BRANCH: v5.2.2
-    CC_TOOLS_QT_BRANCH: v5.1
+    CC_TOOLS_QT_BRANCH: v5.2
     matrix:
         - CPP_STD: 11
           EXTRA_CONFIG: -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=OFF

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -4,7 +4,7 @@ on: [push]
 
 env:
   COMMS_BRANCH: v5.2.2
-  CC_TOOLS_QT_BRANCH: v5.1
+  CC_TOOLS_QT_BRANCH: v5.2
 
 jobs:
   build_gcc_old_ubuntu_20_04:

diff --git a/app/commsdsl2tools_qt/src/ToolsQtCmake.cpp b/app/commsdsl2tools_qt/src/ToolsQtCmake.cpp
@@ -59,7 +59,9 @@ bool ToolsQtCmake::testWriteInternal() const
     static const std::string Template =
         "cmake_minimum_required (VERSION 3.10)\n"
         "project (\"#^#MAIN_NS#$#_cc_tools_qt_plugin\")\n\n"
-        "# Configuration variables\n"
+        "# Build options:\n"
+        "option (OPT_INSTALL_DEFAULT_CONFIG \"Install default plugin configuration\" ON)\n\n"
+        "# Configuration variables:\n"
         "# OPT_QT_MAJOR_VERSION - The major Qt version, defaults to 5\n\n"
         "######################################################################\n\n"
         "if (\"${OPT_QT_MAJOR_VERSION}\" STREQUAL \"\")\n"
@@ -135,9 +137,11 @@ bool ToolsQtCmake::testWriteInternal() const
         "    install (\n"
         "        TARGETS ${name}\n"
         "        DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cc_tools_qt/plugin)\n\n"
-        "    install (\n"
-        "        FILES #^#TOP_NS#$#/#^#MAIN_NS#$#/plugin/${protocol}.cfg\n"
-        "        DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/cc_tools_qt)\n\n"
+        "    if (OPT_INSTALL_DEFAULT_CONFIG)\n"
+        "        install (\n"
+        "            FILES #^#TOP_NS#$#/#^#MAIN_NS#$#/plugin/${protocol}.cfg\n"
+        "            DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/cc_tools_qt)\n"
+        "    endif()\n"
         "endfunction()\n\n"
         "######################################################################\n\n"
         "if (TARGET cc::cc_tools_qt)\n"

diff --git a/app/commsdsl2tools_qt/src/ToolsQtGenerator.cpp b/app/commsdsl2tools_qt/src/ToolsQtGenerator.cpp
@@ -66,7 +66,7 @@ namespace commsdsl2tools_qt
 namespace
 {
 
-const std::string MinToolsQtVersion("5.1.0");    
+const std::string MinToolsQtVersion("5.2.0");    
 
 } // namespace 
 

diff --git a/app/commsdsl2tools_qt/src/ToolsQtPlugin.cpp b/app/commsdsl2tools_qt/src/ToolsQtPlugin.cpp
@@ -762,7 +762,7 @@ bool ToolsQtPlugin::toolsWritePluginConfigInternal()
         "}\n";
 
     util::ReplacementMap repl = {
-        {"ID", toolsAdjustedNameInternal()},
+        {"ID", m_pluginId},
     };        
 
     auto str = commsdsl::gen::util::processTemplate(Templ, repl, true);

diff --git a/lib/include/commsdsl/version.h b/lib/include/commsdsl/version.h
@@ -26,7 +26,7 @@
 #define COMMSDSL_MINOR_VERSION 3U
 
 /// @brief Patch level of the library
-#define COMMSDSL_PATCH_VERSION 0U
+#define COMMSDSL_PATCH_VERSION 1U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define COMMSDSL_MAKE_VERSION(major_, minor_, patch_) \