Release v6.3

commschamp · Mar 3, 2024 · 195e614 · 195e614
2 parents 7a79211 + ed7b676
commit 195e614
Show file tree

Hide file tree

Showing 521 changed files with 2,033 additions and 1,363 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,7 +1,6 @@
 image:
     - Visual Studio 2022
     - Visual Studio 2019    
-    - Visual Studio 2017
 
 init:
     - git config --global core.autocrlf input
@@ -18,26 +17,55 @@ configuration:
     - Release
 
 environment:
-    COMMS_BRANCH: v5.2.1
-    CC_TOOLS_QT_BRANCH: v4.2.3
+    COMMS_BRANCH: v5.2.2
+    CC_TOOLS_QT_BRANCH: v5.1
     matrix:
         - CPP_STD: 11
+          EXTRA_CONFIG: -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=OFF
+          TOOLS_CPP_STD: 17
+          QT_MAJOR: 5
         - CPP_STD: 14
+          EXTRA_CONFIG: -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=OFF
+          TOOLS_CPP_STD: 17
+          QT_MAJOR: 6
+        - CPP_STD: 17
+          EXTRA_CONFIG: -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=OFF
+          TOOLS_CPP_STD: 17
+          QT_MAJOR: 5
+        - CPP_STD: 17
+          EXTRA_CONFIG: "-DCOMMSDSL_BUILD_COMMSDSL2COMMS_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TEST_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK2=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK3=OFF"
+          TOOLS_CPP_STD: 17
+          QT_MAJOR: 5
+        - CPP_STD: 17
+          EXTRA_CONFIG: "-DCOMMSDSL_BUILD_COMMSDSL2COMMS_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TEST_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK1=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK3=OFF"
+          TOOLS_CPP_STD: 17
+          QT_MAJOR: 6
+        - CPP_STD: 17
+          EXTRA_CONFIG: "-DCOMMSDSL_BUILD_COMMSDSL2COMMS_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TEST_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK1=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK2=OFF"
+          TOOLS_CPP_STD: 17
+          QT_MAJOR: 6
         - CPP_STD: 17
-        - CPP_STD: 20
           EXTRA_CONFIG: -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=OFF
+          TOOLS_CPP_STD: 17
+          QT_MAJOR: 5
         - CPP_STD: 20
           EXTRA_CONFIG: "-DCOMMSDSL_BUILD_COMMSDSL2COMMS_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TEST_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK2=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK3=OFF"
+          TOOLS_CPP_STD: 20
+          QT_MAJOR: 5
         - CPP_STD: 20
           EXTRA_CONFIG: "-DCOMMSDSL_BUILD_COMMSDSL2COMMS_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TEST_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK1=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK3=OFF"
+          TOOLS_CPP_STD: 20
+          QT_MAJOR: 6
         - CPP_STD: 20
           EXTRA_CONFIG: "-DCOMMSDSL_BUILD_COMMSDSL2COMMS_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TEST_TESTS=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK1=OFF -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS_CHUNK2=OFF"
+          TOOLS_CPP_STD: 20
+          QT_MAJOR: 6
 
 matrix:
     fast_finish: false
     exclude:
-        - image: Visual Studio 2017
-          CPP_STD: 20                           
+        - platform: x86
+          QT_MAJOR: 6                         
 
 install:
     - call script\appveyor_install.bat
@@ -49,14 +77,18 @@ install:
     - set COMMON_INSTALL_DIR=%BUILD_DIR%\install
     - set COMMON_BUILD_TYPE=%CONFIGURATION%
     - set COMMON_CXX_STANDARD=%CPP_STD%
+    - set GENERATOR="%CMAKE_GENERATOR%"
+    - set PLATFORM="%CMAKE_PLATFORM%"
+    - set CC_TOOLS_QT_MAJOR_QT_VERSION=%QT_MAJOR%
     - call script\prepare_externals.bat
 
 build_script:
     - echo ------------------------- Building Project -------------------------
     - cd %BUILD_DIR%
-    - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX="%COMMON_INSTALL_DIR%" ^
+    - cmake .. -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" %PLATFORM_PARAM% -DCMAKE_INSTALL_PREFIX="%COMMON_INSTALL_DIR%" ^
         -DCMAKE_PREFIX_PATH="%COMMON_INSTALL_DIR%" -DCOMMSDSL_TESTS_CXX_STANDARD=%CPP_STD% ^
-        -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON %EXTRA_CONFIG%
+        -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON ^
+        -DCMAKE_CXX_STANDARD=%TOOLS_CPP_STD% -DCOMMSDSL_TESTS_QT_VERSION=%QT_MAJOR% %EXTRA_CONFIG%
     - cmake --build . --config %CONFIGURATION% --target install
     - echo ------------------------- Testing -------------------------
     - ctest

diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -3,8 +3,8 @@ name: Github Actions Build
 on: [push]
 
 env:
-  COMMS_BRANCH: v5.2.1
-  CC_TOOLS_QT_BRANCH: v4.2.3
+  COMMS_BRANCH: v5.2.2
+  CC_TOOLS_QT_BRANCH: v5.1
 
 jobs:
   build_gcc_old_ubuntu_20_04:
@@ -49,6 +49,7 @@ jobs:
         COMMON_CXX_STANDARD: ${{matrix.cpp}}
         COMMS_TAG: ${{env.COMMS_BRANCH}}
         CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
+        CC_TOOLS_QT_SKIP: 1
 
     - name: Configure CMake
       shell: bash
@@ -58,7 +59,7 @@ jobs:
           -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=gold -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \
           -DCOMMSDSL_TESTS_C_COMPILER=gcc-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_COMPILER=g++-${{matrix.cc_ver}} \
           -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_USE_SANITIZERS=OFF \
-          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
+          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=OFF
       env:
         CC: gcc-8
         CXX: g++-8
@@ -117,10 +118,12 @@ jobs:
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
         -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_BUILD_DOC=ON \
-        -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
+        -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
+        -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=${{env.BUILD_TOOLS_QT_UNIT_TESTS}}
       env:
         CC: gcc-${{matrix.cc_ver}}
         CXX: g++-${{matrix.cc_ver}}
+        BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build
@@ -179,13 +182,16 @@ jobs:
       run: |
         cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
         -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
-        -DCOMMSDSL_TESTS_QT_VERSION=${{matrix.qt_ver}} \
+        -DCMAKE_CXX_STANDARD=${{env.TOOLS_CXX_STANDARD}} -DCOMMSDSL_TESTS_QT_VERSION=${{matrix.qt_ver}} \
         -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_BUILD_DOC=ON -DCMAKE_IGNORE_PATH=/usr/local/bin \
         -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
-        -DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON -DCOMMSDSL_BUILD_COMMSDSL2EMSCRIPTEN=ON
+        -DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON -DCOMMSDSL_BUILD_COMMSDSL2EMSCRIPTEN=ON \
+        -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=${{env.BUILD_TOOLS_QT_UNIT_TESTS}}
       env:
         CC: gcc-${{matrix.cc_ver}}
         CXX: g++-${{matrix.cc_ver}}
+        BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
+        TOOLS_CXX_STANDARD: "${{ matrix.cpp >= 17 && matrix.cpp || '17' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build
@@ -253,10 +259,12 @@ jobs:
           -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=gold -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install \
           -DCOMMSDSL_TESTS_C_COMPILER=clang-${{matrix.cc_ver}} -DCOMMSDSL_TESTS_CXX_COMPILER=clang++-${{matrix.cc_ver}} \
           -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_USE_SANITIZERS=OFF \
-          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
+          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
+          -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=${{env.BUILD_TOOLS_QT_UNIT_TESTS}}
       env:
         CC: clang-6.0
         CXX: clang++-6.0
+        BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build
@@ -316,11 +324,14 @@ jobs:
       run: |
           cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
           -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
-          -DCOMMSDSL_BUILD_UNIT_TESTS=ON \
-          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
+          -DCMAKE_CXX_STANDARD=${{env.TOOLS_CXX_STANDARD}} -DCOMMSDSL_BUILD_UNIT_TESTS=ON \
+          -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
+          -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=${{env.BUILD_TOOLS_QT_UNIT_TESTS}}
       env:
         CC: clang-${{matrix.cc_ver}}
         CXX: clang++-${{matrix.cc_ver}}
+        BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
+        TOOLS_CXX_STANDARD: "${{ matrix.cpp >= 17 && matrix.cpp || '17' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build
@@ -340,9 +351,16 @@ jobs:
       fail-fast: false
       matrix:
         type: [Debug, Release, MinSizeRel]
-        cc_ver: [12, 13, 14]
+        cc_ver: [12, 13, 14, 15]
         cpp: [11, 14, 17, 20]
         qt_ver: [5, 6]
+        exclude:
+          - cc_ver: 12
+            cpp: 20   
+          - cc_ver: 13
+            cpp: 20   
+          - cc_ver: 14
+            cpp: 20          
 
     steps:
     - uses: actions/checkout@v2
@@ -379,13 +397,17 @@ jobs:
       run: |
           cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
           -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
-          -DCOMMSDSL_TESTS_QT_VERSION=${{matrix.qt_ver}} \
+          -DCMAKE_CXX_STANDARD=${{env.TOOLS_CXX_STANDARD}} -DCOMMSDSL_TESTS_QT_VERSION=${{matrix.qt_ver}} \
           -DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCMAKE_IGNORE_PATH=/usr/local/bin \
           -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
-          -DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON -DCOMMSDSL_BUILD_COMMSDSL2EMSCRIPTEN=ON
+          -DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON -DCOMMSDSL_BUILD_COMMSDSL2EMSCRIPTEN=ON \
+          -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=${{env.BUILD_TOOLS_QT_UNIT_TESTS}}
+
       env:
         CC: clang-${{matrix.cc_ver}}
         CXX: clang++-${{matrix.cc_ver}}
+        BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
+        TOOLS_CXX_STANDARD: "${{ matrix.cpp >= 17 && matrix.cpp || '17' }}"
 
     - name: Build Target 
       working-directory: ${{runner.workspace}}/build

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.10)
 project ("commsdsl")
 
 option (COMMSDSL_WARN_AS_ERR "Treat warning as error" ON)
@@ -29,7 +29,11 @@ option (COMMSDSL_WIN_ALLOW_LIBXML_BUILD "Allow internal build of libxml2 on Wind
 # COMMSDSL_TESTS_C_COMPILER - C compiler to build unittests
 # COMMSDSL_TESTS_CXX_COMPILER - C++ compiler to build unittests
 # COMMSDSL_EXTERNALS_DIR - Directory to contain sources for external projects, defaults to ${PROJECT_SOURCE_DIR}/externals.
-set (COMMSDSL_TESTS_QT_VERSION 5 CACHE STRING "The major Qt version for tests")
+# COMMSDSL_TESTS_QT_VERSION - The major Qt version for tests, defaults to 5
+# COMMSDSL_TESTS_CXX_STANDARD - The C++ standard to use in tests, defaults to 11
+
+# Other used CMake variables
+# CMAKE_CXX_STANDARD - The C++ standard to use during the compilation, defaults to 17 (min)
 
 # Deprecated options for backward compatibility, use the ones above for new builds.
 # ---------------------------
@@ -52,9 +56,21 @@ commsdsl_negate_option(COMMSDSL_NO_TESTS COMMSDSL_BUILD_UNIT_TESTS)
 
 ################################################
 
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "The C++ standard to use")
-set(COMMSDSL_TESTS_CXX_STANDARD 11 CACHE STRING "The C++ standard to use in tests")
+if ("${COMMSDSL_TESTS_QT_VERSION}" STREQUAL "")
+    set (COMMSDSL_TESTS_QT_VERSION 5)
+endif ()
+
+if ("${CMAKE_CXX_STANDARD}" STREQUAL "")
+    set (CMAKE_CXX_STANDARD 17)
+endif ()
+
+if ("${CMAKE_CXX_STANDARD}" VERSION_LESS "17")
+    message (FATAL_ERROR "Use C++17 or later to compile this project.")
+endif()
 
+if ("${COMMSDSL_TESTS_CXX_STANDARD}" STREQUAL "")
+    set (COMMSDSL_TESTS_CXX_STANDARD ${CMAKE_CXX_STANDARD})
+endif ()
 
 if (NOT COMMSDSL_TESTS_C_COMPILER)
     set (COMMSDSL_TESTS_C_COMPILER ${CMAKE_C_COMPILER})

diff --git a/app/commsdsl2comms/src/CommsBitfieldField.cpp b/app/commsdsl2comms/src/CommsBitfieldField.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -152,7 +152,7 @@ std::string CommsBitfieldField::commsDefBaseClassImpl() const
     };
 
     if (!repl["FIELD_OPTS"].empty()) {
-        repl["COMMA"] = ",";
+        repl["COMMA"] = std::string(",");
     }
 
     if (comms::isGlobalField(*this)) {

diff --git a/app/commsdsl2comms/src/CommsBitfieldField.h b/app/commsdsl2comms/src/CommsBitfieldField.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/app/commsdsl2comms/src/CommsBundleField.cpp b/app/commsdsl2comms/src/CommsBundleField.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/app/commsdsl2comms/src/CommsBundleField.h b/app/commsdsl2comms/src/CommsBundleField.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/app/commsdsl2comms/src/CommsChecksumLayer.cpp b/app/commsdsl2comms/src/CommsChecksumLayer.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -104,7 +104,7 @@ std::string CommsChecksumLayer::commsDefBaseTypeImpl(const std::string& prevName
     };
 
     if (!repl["EXTRA_OPT"].empty()) {
-        repl["COMMA"] = ",";
+        repl["COMMA"] = std::string(",");
     }
 
     if (!checksumDslObj().untilLayer().empty()) {

diff --git a/app/commsdsl2comms/src/CommsChecksumLayer.h b/app/commsdsl2comms/src/CommsChecksumLayer.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/app/commsdsl2comms/src/CommsCmake.cpp b/app/commsdsl2comms/src/CommsCmake.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -45,7 +45,6 @@ bool CommsCmake::write(CommsGenerator& generator)
 
 bool CommsCmake::commsWriteInternal() const
 {
-    static_cast<void>(m_generator);
     auto filePath = 
         util::pathAddElem(
             m_generator.getOutputDir(), strings::cmakeListsFileStr());    
@@ -58,7 +57,7 @@ bool CommsCmake::commsWriteInternal() const
     }
 
     const std::string Templ = 
-        "cmake_minimum_required (VERSION 3.1)\n"
+        "cmake_minimum_required (VERSION 3.10)\n"
         "project (\"#^#NAME#$#\")\n\n"
         "option (OPT_REQUIRE_COMMS_LIB \"Require COMMS library, find it and set as dependency to the protocol library\" ON)\n\n"
         "# Other parameters:\n"
@@ -129,7 +128,7 @@ bool CommsCmake::commsWriteInternal() const
         "    (NOT \"${minor_ver}\" STREQUAL \"\") AND\n"
         "    (NOT \"${patch_ver}\" STREQUAL \"\"))\n"
         "    set (#^#CAP_NAME#$#_VERSION \"${major_ver}.${minor_ver}.${patch_ver}\")\n\n"
-        "    message (STATUS \"Detected version ${#^#CAP_NAME#$#_VERSION} of the protocol\")\n"
+        "    message (STATUS \"Detected version ${#^#CAP_NAME#$#_VERSION} of the protocol library.\")\n"
         "    include(CMakePackageConfigHelpers)\n"
         "    write_basic_package_version_file(\n"
         "        ${CMAKE_BINARY_DIR}/${OPT_CMAKE_EXPORT_CONFIG_NAME}ConfigVersion.cmake\n"

diff --git a/app/commsdsl2comms/src/CommsCmake.h b/app/commsdsl2comms/src/CommsCmake.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

diff --git a/app/commsdsl2comms/src/CommsCustomLayer.cpp b/app/commsdsl2comms/src/CommsCustomLayer.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ std::string CommsCustomLayer::commsDefBaseTypeImpl(const std::string& prevName)
     }
 
     if (!repl["EXTRA_OPT"].empty()) {
-        repl["COMMA"] = ",";
+        repl["COMMA"] = std::string(",");
     }
 
     return util::processTemplate(Templ, repl);

diff --git a/app/commsdsl2comms/src/CommsCustomLayer.h b/app/commsdsl2comms/src/CommsCustomLayer.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2019 - 2023 (C). Alex Robenko. All rights reserved.
+// Copyright 2019 - 2024 (C). Alex Robenko. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.