From 8055014f991273c85ac2d4fe993df472d6f6f921 Mon Sep 17 00:00:00 2001 From: dorotaphanSiili <108282075+dorotaphanSiili@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:40:52 +0200 Subject: [PATCH 1/4] feat: update cpp version --- README.md | 4 ++-- docs/docs/features/data/example/CMakeLists.txt | 2 +- docs/docs/features/features.md | 2 +- docs/docs/intro.md | 6 +++--- docs/docs/quickstart/index.md | 4 ++-- goldenmaster/CMakeLists.txt | 2 +- goldenmaster/README.md | 6 +++--- goldenmaster/apigear/CMakeLists.txt | 2 +- goldenmaster/apigear/conanfile.py | 2 +- goldenmaster/apigear/olink/CMakeLists.txt | 2 +- goldenmaster/apigear/utilities/CMakeLists.txt | 2 +- goldenmaster/examples/app/CMakeLists.txt | 2 +- goldenmaster/examples/appthreadsafe/CMakeLists.txt | 2 +- goldenmaster/examples/mqttclient/CMakeLists.txt | 2 +- goldenmaster/examples/mqttserver/CMakeLists.txt | 2 +- goldenmaster/examples/olinkclient/CMakeLists.txt | 2 +- goldenmaster/examples/olinkserver/CMakeLists.txt | 2 +- goldenmaster/modules/counter/CMakeLists.txt | 2 +- goldenmaster/modules/counter/conan/conanfile.py | 2 +- .../modules/counter/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/counter/generated/api/CMakeLists.txt | 2 +- goldenmaster/modules/counter/generated/core/CMakeLists.txt | 2 +- .../modules/counter/generated/monitor/CMakeLists.txt | 2 +- goldenmaster/modules/counter/generated/olink/CMakeLists.txt | 2 +- goldenmaster/modules/counter/implementation/CMakeLists.txt | 2 +- goldenmaster/modules/custom_types/CMakeLists.txt | 2 +- goldenmaster/modules/custom_types/conan/conanfile.py | 2 +- .../modules/custom_types/conan/test_package/CMakeLists.txt | 2 +- .../modules/custom_types/generated/api/CMakeLists.txt | 2 +- .../modules/custom_types/generated/core/CMakeLists.txt | 2 +- .../modules/custom_types/generated/monitor/CMakeLists.txt | 2 +- .../modules/custom_types/generated/olink/CMakeLists.txt | 2 +- .../modules/custom_types/implementation/CMakeLists.txt | 2 +- goldenmaster/modules/extern_types/CMakeLists.txt | 2 +- goldenmaster/modules/extern_types/conan/conanfile.py | 2 +- .../modules/extern_types/conan/test_package/CMakeLists.txt | 2 +- .../modules/extern_types/generated/api/CMakeLists.txt | 2 +- .../modules/extern_types/generated/core/CMakeLists.txt | 2 +- .../modules/extern_types/generated/monitor/CMakeLists.txt | 2 +- .../modules/extern_types/generated/olink/CMakeLists.txt | 2 +- .../modules/extern_types/implementation/CMakeLists.txt | 2 +- goldenmaster/modules/tb_enum/CMakeLists.txt | 2 +- goldenmaster/modules/tb_enum/conan/conanfile.py | 2 +- .../modules/tb_enum/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_enum/generated/api/CMakeLists.txt | 2 +- goldenmaster/modules/tb_enum/generated/core/CMakeLists.txt | 2 +- .../modules/tb_enum/generated/monitor/CMakeLists.txt | 2 +- goldenmaster/modules/tb_enum/generated/olink/CMakeLists.txt | 2 +- goldenmaster/modules/tb_enum/implementation/CMakeLists.txt | 2 +- goldenmaster/modules/tb_names/CMakeLists.txt | 2 +- goldenmaster/modules/tb_names/conan/conanfile.py | 2 +- .../modules/tb_names/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_names/generated/api/CMakeLists.txt | 2 +- goldenmaster/modules/tb_names/generated/core/CMakeLists.txt | 2 +- .../modules/tb_names/generated/monitor/CMakeLists.txt | 2 +- .../modules/tb_names/generated/olink/CMakeLists.txt | 2 +- goldenmaster/modules/tb_names/implementation/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same1/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same1/conan/conanfile.py | 2 +- .../modules/tb_same1/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same1/generated/api/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same1/generated/core/CMakeLists.txt | 2 +- .../modules/tb_same1/generated/monitor/CMakeLists.txt | 2 +- .../modules/tb_same1/generated/olink/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same1/implementation/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same2/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same2/conan/conanfile.py | 2 +- .../modules/tb_same2/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same2/generated/api/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same2/generated/core/CMakeLists.txt | 2 +- .../modules/tb_same2/generated/monitor/CMakeLists.txt | 2 +- .../modules/tb_same2/generated/olink/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same2/implementation/CMakeLists.txt | 2 +- goldenmaster/modules/tb_simple/CMakeLists.txt | 2 +- goldenmaster/modules/tb_simple/conan/conanfile.py | 2 +- .../modules/tb_simple/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_simple/generated/api/CMakeLists.txt | 2 +- .../modules/tb_simple/generated/core/CMakeLists.txt | 2 +- .../modules/tb_simple/generated/monitor/CMakeLists.txt | 2 +- .../modules/tb_simple/generated/olink/CMakeLists.txt | 2 +- .../modules/tb_simple/implementation/CMakeLists.txt | 2 +- goldenmaster/modules/testbed1/CMakeLists.txt | 2 +- goldenmaster/modules/testbed1/conan/conanfile.py | 2 +- .../modules/testbed1/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/testbed1/generated/api/CMakeLists.txt | 2 +- goldenmaster/modules/testbed1/generated/core/CMakeLists.txt | 2 +- .../modules/testbed1/generated/monitor/CMakeLists.txt | 2 +- .../modules/testbed1/generated/olink/CMakeLists.txt | 2 +- goldenmaster/modules/testbed1/implementation/CMakeLists.txt | 2 +- goldenmaster/modules/testbed2/CMakeLists.txt | 2 +- goldenmaster/modules/testbed2/conan/conanfile.py | 2 +- .../modules/testbed2/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/testbed2/generated/api/CMakeLists.txt | 2 +- goldenmaster/modules/testbed2/generated/core/CMakeLists.txt | 2 +- .../modules/testbed2/generated/monitor/CMakeLists.txt | 2 +- .../modules/testbed2/generated/olink/CMakeLists.txt | 2 +- goldenmaster/modules/testbed2/implementation/CMakeLists.txt | 2 +- templates/CMakeLists.txt.tpl | 2 +- templates/README.md | 6 +++--- templates/apigear/CMakeLists.txt | 2 +- templates/apigear/conanfile.py | 2 +- templates/apigear/olink/CMakeLists.txt | 2 +- templates/apigear/utilities/CMakeLists.txt | 2 +- templates/examples/app/CMakeLists.txt.tpl | 2 +- templates/examples/appthreadsafe/CMakeLists.txt.tpl | 2 +- templates/examples/mqttclient/CMakeLists.txt.tpl | 2 +- templates/examples/mqttserver/CMakeLists.txt.tpl | 2 +- templates/examples/olinkclient/CMakeLists.txt.tpl | 2 +- templates/examples/olinkserver/CMakeLists.txt.tpl | 2 +- templates/module/CMakeLists.txt.tpl | 2 +- templates/module/conan/conanfile.py.tpl | 2 +- templates/module/conan/test_package/CMakeLists.txt.tpl | 2 +- templates/module/generated/api/CMakeLists.txt.tpl | 2 +- templates/module/generated/core/CMakeLists.txt.tpl | 2 +- templates/module/generated/monitor/CMakeLists.txt.tpl | 2 +- templates/module/generated/olink/CMakeLists.txt.tpl | 2 +- templates/module/source/CMakeLists.txt.tpl | 2 +- 117 files changed, 125 insertions(+), 125 deletions(-) diff --git a/README.md b/README.md index 96e56fc7a..ebf67ab2b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# C++ 14 Blueprint +# C++ 17 Blueprint -A pure C++ 14 blueprint with [CMake](https://cmake.org/) build system support. +A pure C++ 17 blueprint with [CMake](https://cmake.org/) build system support. [Poco](https://pocoproject.org/) is used for network connections (feature: apigear). The generated code can be enhanced with support for the [Conan](https://conan.io/) package manager. diff --git a/docs/docs/features/data/example/CMakeLists.txt b/docs/docs/features/data/example/CMakeLists.txt index f0f6398cf..8a930a7ae 100644 --- a/docs/docs/features/data/example/CMakeLists.txt +++ b/docs/docs/features/data/example/CMakeLists.txt @@ -4,7 +4,7 @@ project(OLinkClientSimuExample) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/docs/docs/features/features.md b/docs/docs/features/features.md index c661b4d2b..0205fb6ef 100644 --- a/docs/docs/features/features.md +++ b/docs/docs/features/features.md @@ -24,7 +24,7 @@ Follow the documentation for the [code generation](/docs/guide/intro) in general Or try first the [quick start guide](../quickstart/index.md) which shows how to prepare api and generate code out of it. :::tip -For questions regarding the template please go to our [discussions page](https://github.com/orgs/apigear-io/discussions). For feature requests or bug reports please use our [issue tracker](https://github.com/apigear-io/template-cpp14/issues). +For questions regarding the template please go to our [discussions page](https://github.com/orgs/apigear-io/discussions). For feature requests or bug reports please use our [issue tracker](https://github.com/apigear-io/template-cpp17/issues). ::: ### Example API diff --git a/docs/docs/intro.md b/docs/docs/intro.md index 800290bfc..ab01eadd4 100644 --- a/docs/docs/intro.md +++ b/docs/docs/intro.md @@ -2,11 +2,11 @@ sidebar_position: 1 --- -# Template C++ 14 +# Template C++ 17 -This is the documentation for the _cpp14_ template for the [ApiGear](/docs/guide/intro) code generator. +This is the documentation for the _cpp17_ template for the [ApiGear](/docs/guide/intro) code generator. It is split in several parts: -- [Quick-Start](quickstart/index.md?current-template=template-cpp14) is the easiest way to get started +- [Quick-Start](quickstart/index.md?current-template=template-cpp17) is the easiest way to get started - [Features](features/features.md) explains the available code generator features and their usage and purpose. diff --git a/docs/docs/quickstart/index.md b/docs/docs/quickstart/index.md index 51fff46f0..985f3df12 100644 --- a/docs/docs/quickstart/index.md +++ b/docs/docs/quickstart/index.md @@ -7,7 +7,7 @@ import QuickStartCommon from "@site/docs/_quickstart_common.md" The Quick-Start guide explains how in a few steps you get from an API definition to a functional c++ example. -Steps one and two are universal for other technologies. In the step two you will choose a concrete _cpp14_ template. +Steps one and two are universal for other technologies. In the step two you will choose a concrete _cpp17_ template. For more general information about first steps with ApiGear [First Steps](/docs/guide/intro) The quick start enables only basic features: the [api](features/api.md) generation and simple [stub](features/stubs.md) implementation. @@ -102,7 +102,7 @@ project(MyExample) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_executable(MyExample main.cpp) diff --git a/goldenmaster/CMakeLists.txt b/goldenmaster/CMakeLists.txt index 0a817af4a..255ce9e93 100644 --- a/goldenmaster/CMakeLists.txt +++ b/goldenmaster/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.24) project(test) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # on Windows it is helpful to have all binary files next to each other diff --git a/goldenmaster/README.md b/goldenmaster/README.md index c876fb078..6f98f6743 100644 --- a/goldenmaster/README.md +++ b/goldenmaster/README.md @@ -1,6 +1,6 @@ -# C++ 14 Blueprint +# C++ 17 Blueprint -A pure C++ 14 blueprint with [CMake](https://cmake.org/) build system support. [Poco](https://pocoproject.org/) is used for network connections. The generated code can be enhanced with support for the [Conan](https://conan.io/) package manager. +A pure C++ 17 blueprint with [CMake](https://cmake.org/) build system support. [Poco](https://pocoproject.org/) is used for network connections. The generated code can be enhanced with support for the [Conan](https://conan.io/) package manager. ## Features The following list presents a set of features which can be individually enabled in the solution file for code generation. @@ -124,7 +124,7 @@ If you do not want or can not use conan, the poco libraries must installed separ ``` $ sudo apt install gcc-10 g++-10 git cmake libpoco-dev ``` -2. Set gcc-10 with C++14 support as default compiler +2. Set gcc-10 with C++17 support as default compiler ``` $ sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 --slave /usr/bin/g++ g++ /usr/bin/g++-10 diff --git a/goldenmaster/apigear/CMakeLists.txt b/goldenmaster/apigear/CMakeLists.txt index f315aee6b..08eb6d6b2 100644 --- a/goldenmaster/apigear/CMakeLists.txt +++ b/goldenmaster/apigear/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.20) project(apigear) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(apigear_COMPONENTS "") diff --git a/goldenmaster/apigear/conanfile.py b/goldenmaster/apigear/conanfile.py index a528c7bc2..784ab7e13 100644 --- a/goldenmaster/apigear/conanfile.py +++ b/goldenmaster/apigear/conanfile.py @@ -81,7 +81,7 @@ def build_requirements(self): self.test_requires("trompeloeil/46") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/apigear/olink/CMakeLists.txt b/goldenmaster/apigear/olink/CMakeLists.txt index fbcb98ebd..3faa66592 100644 --- a/goldenmaster/apigear/olink/CMakeLists.txt +++ b/goldenmaster/apigear/olink/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.20) project(poco-olink) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/goldenmaster/apigear/utilities/CMakeLists.txt b/goldenmaster/apigear/utilities/CMakeLists.txt index 4da6501f0..e3a8cd8cf 100644 --- a/goldenmaster/apigear/utilities/CMakeLists.txt +++ b/goldenmaster/apigear/utilities/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.20) project(utilities) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/goldenmaster/examples/app/CMakeLists.txt b/goldenmaster/examples/app/CMakeLists.txt index 96f793071..b4a9f746b 100644 --- a/goldenmaster/examples/app/CMakeLists.txt +++ b/goldenmaster/examples/app/CMakeLists.txt @@ -4,7 +4,7 @@ project(App) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/examples/appthreadsafe/CMakeLists.txt b/goldenmaster/examples/appthreadsafe/CMakeLists.txt index 1c315cc09..e06d83587 100644 --- a/goldenmaster/examples/appthreadsafe/CMakeLists.txt +++ b/goldenmaster/examples/appthreadsafe/CMakeLists.txt @@ -4,7 +4,7 @@ project(AppThreadSafe) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/examples/mqttclient/CMakeLists.txt b/goldenmaster/examples/mqttclient/CMakeLists.txt index 2a16d43ad..c8b0c1e82 100644 --- a/goldenmaster/examples/mqttclient/CMakeLists.txt +++ b/goldenmaster/examples/mqttclient/CMakeLists.txt @@ -4,7 +4,7 @@ project(MQTTClient) # append local binary directory for conan packages to be found set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/examples/mqttserver/CMakeLists.txt b/goldenmaster/examples/mqttserver/CMakeLists.txt index 836d39a93..29392b699 100644 --- a/goldenmaster/examples/mqttserver/CMakeLists.txt +++ b/goldenmaster/examples/mqttserver/CMakeLists.txt @@ -4,7 +4,7 @@ project(MQTTServer) # append local binary directory for conan packages to be found set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/examples/olinkclient/CMakeLists.txt b/goldenmaster/examples/olinkclient/CMakeLists.txt index c24560f40..581d22adb 100644 --- a/goldenmaster/examples/olinkclient/CMakeLists.txt +++ b/goldenmaster/examples/olinkclient/CMakeLists.txt @@ -4,7 +4,7 @@ project(OLinkClient) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/examples/olinkserver/CMakeLists.txt b/goldenmaster/examples/olinkserver/CMakeLists.txt index e92f36cba..d37d8c4a0 100644 --- a/goldenmaster/examples/olinkserver/CMakeLists.txt +++ b/goldenmaster/examples/olinkserver/CMakeLists.txt @@ -4,7 +4,7 @@ project(OLinkServer) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}/cmake) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/modules/counter/CMakeLists.txt b/goldenmaster/modules/counter/CMakeLists.txt index a4854ad26..cd87bfbd6 100644 --- a/goldenmaster/modules/counter/CMakeLists.txt +++ b/goldenmaster/modules/counter/CMakeLists.txt @@ -4,7 +4,7 @@ project(counter) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/counter/conan/conanfile.py b/goldenmaster/modules/counter/conan/conanfile.py index 01f0466c3..33c181420 100644 --- a/goldenmaster/modules/counter/conan/conanfile.py +++ b/goldenmaster/modules/counter/conan/conanfile.py @@ -46,7 +46,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt b/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt index e633897a9..a1ef48cbc 100644 --- a/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testcounter) include(CTest) find_package(counter CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for counter diff --git a/goldenmaster/modules/counter/generated/api/CMakeLists.txt b/goldenmaster/modules/counter/generated/api/CMakeLists.txt index b9ca0fe75..4d7ad64c8 100644 --- a/goldenmaster/modules/counter/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/counter/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(custom_types REQUIRED COMPONENTS api) find_package(extern_types REQUIRED COMPONENTS api) diff --git a/goldenmaster/modules/counter/generated/core/CMakeLists.txt b/goldenmaster/modules/counter/generated/core/CMakeLists.txt index f9ab275ab..53fd497d6 100644 --- a/goldenmaster/modules/counter/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/counter/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/counter/generated/monitor/CMakeLists.txt b/goldenmaster/modules/counter/generated/monitor/CMakeLists.txt index 45a926094..35f31b827 100644 --- a/goldenmaster/modules/counter/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/counter/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/counter/generated/olink/CMakeLists.txt b/goldenmaster/modules/counter/generated/olink/CMakeLists.txt index c34b0ab92..bca915283 100644 --- a/goldenmaster/modules/counter/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/counter/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/counter/implementation/CMakeLists.txt b/goldenmaster/modules/counter/implementation/CMakeLists.txt index c835a6497..671f94470 100644 --- a/goldenmaster/modules/counter/implementation/CMakeLists.txt +++ b/goldenmaster/modules/counter/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/goldenmaster/modules/custom_types/CMakeLists.txt b/goldenmaster/modules/custom_types/CMakeLists.txt index e53ff20bd..6517f2d84 100644 --- a/goldenmaster/modules/custom_types/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/CMakeLists.txt @@ -4,7 +4,7 @@ project(custom_types) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/custom_types/conan/conanfile.py b/goldenmaster/modules/custom_types/conan/conanfile.py index 49b023bb0..e699ca6ff 100644 --- a/goldenmaster/modules/custom_types/conan/conanfile.py +++ b/goldenmaster/modules/custom_types/conan/conanfile.py @@ -40,7 +40,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt b/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt index aa7276e51..edb041681 100644 --- a/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testcustom_types) include(CTest) find_package(custom_types CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for custom_types diff --git a/goldenmaster/modules/custom_types/generated/api/CMakeLists.txt b/goldenmaster/modules/custom_types/generated/api/CMakeLists.txt index 155cd0d86..395a6678c 100644 --- a/goldenmaster/modules/custom_types/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/modules/custom_types/generated/core/CMakeLists.txt b/goldenmaster/modules/custom_types/generated/core/CMakeLists.txt index ccfbe9d1c..b6c0b9d97 100644 --- a/goldenmaster/modules/custom_types/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/custom_types/generated/monitor/CMakeLists.txt b/goldenmaster/modules/custom_types/generated/monitor/CMakeLists.txt index c77040dfe..6e0f77b1f 100644 --- a/goldenmaster/modules/custom_types/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/custom_types/generated/olink/CMakeLists.txt b/goldenmaster/modules/custom_types/generated/olink/CMakeLists.txt index 9435d0a2d..d101dc598 100644 --- a/goldenmaster/modules/custom_types/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/custom_types/implementation/CMakeLists.txt b/goldenmaster/modules/custom_types/implementation/CMakeLists.txt index 33cc2efe9..07de5928b 100644 --- a/goldenmaster/modules/custom_types/implementation/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/goldenmaster/modules/extern_types/CMakeLists.txt b/goldenmaster/modules/extern_types/CMakeLists.txt index 52961aa53..98b600ec1 100644 --- a/goldenmaster/modules/extern_types/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/CMakeLists.txt @@ -4,7 +4,7 @@ project(extern_types) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/extern_types/conan/conanfile.py b/goldenmaster/modules/extern_types/conan/conanfile.py index d45d8b151..eb9cada5f 100644 --- a/goldenmaster/modules/extern_types/conan/conanfile.py +++ b/goldenmaster/modules/extern_types/conan/conanfile.py @@ -41,7 +41,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt b/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt index af553d2a8..c2606ea4d 100644 --- a/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testextern_types) include(CTest) find_package(extern_types CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for extern_types diff --git a/goldenmaster/modules/extern_types/generated/api/CMakeLists.txt b/goldenmaster/modules/extern_types/generated/api/CMakeLists.txt index 4565e0520..58b68d72c 100644 --- a/goldenmaster/modules/extern_types/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(Eigen3 REQUIRED COMPONENTS Eigen) add_library(extern_types-api INTERFACE) diff --git a/goldenmaster/modules/extern_types/generated/core/CMakeLists.txt b/goldenmaster/modules/extern_types/generated/core/CMakeLists.txt index 5038edf94..961b97bfa 100644 --- a/goldenmaster/modules/extern_types/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/extern_types/generated/monitor/CMakeLists.txt b/goldenmaster/modules/extern_types/generated/monitor/CMakeLists.txt index 663caf349..54b8d31c7 100644 --- a/goldenmaster/modules/extern_types/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/extern_types/generated/olink/CMakeLists.txt b/goldenmaster/modules/extern_types/generated/olink/CMakeLists.txt index e8369fb3f..4d8c6d05f 100644 --- a/goldenmaster/modules/extern_types/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/extern_types/implementation/CMakeLists.txt b/goldenmaster/modules/extern_types/implementation/CMakeLists.txt index a1477b7c1..2c1aa7952 100644 --- a/goldenmaster/modules/extern_types/implementation/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/goldenmaster/modules/tb_enum/CMakeLists.txt b/goldenmaster/modules/tb_enum/CMakeLists.txt index 089f78060..6358880de 100644 --- a/goldenmaster/modules/tb_enum/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/CMakeLists.txt @@ -4,7 +4,7 @@ project(tb_enum) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/tb_enum/conan/conanfile.py b/goldenmaster/modules/tb_enum/conan/conanfile.py index 6b1b24303..046420220 100644 --- a/goldenmaster/modules/tb_enum/conan/conanfile.py +++ b/goldenmaster/modules/tb_enum/conan/conanfile.py @@ -44,7 +44,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt index 16444b7be..21e83f2e5 100644 --- a/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testtb_enum) include(CTest) find_package(tb_enum CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for tb_enum diff --git a/goldenmaster/modules/tb_enum/generated/api/CMakeLists.txt b/goldenmaster/modules/tb_enum/generated/api/CMakeLists.txt index 7b083c254..c6b78501f 100644 --- a/goldenmaster/modules/tb_enum/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/modules/tb_enum/generated/core/CMakeLists.txt b/goldenmaster/modules/tb_enum/generated/core/CMakeLists.txt index 996d8319e..efda57b0c 100644 --- a/goldenmaster/modules/tb_enum/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/tb_enum/generated/monitor/CMakeLists.txt b/goldenmaster/modules/tb_enum/generated/monitor/CMakeLists.txt index 48d5abba0..2f29d7bcd 100644 --- a/goldenmaster/modules/tb_enum/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/tb_enum/generated/olink/CMakeLists.txt b/goldenmaster/modules/tb_enum/generated/olink/CMakeLists.txt index 4da9b0036..470a9b798 100644 --- a/goldenmaster/modules/tb_enum/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/tb_enum/implementation/CMakeLists.txt b/goldenmaster/modules/tb_enum/implementation/CMakeLists.txt index 47ce4e7a9..220171ba2 100644 --- a/goldenmaster/modules/tb_enum/implementation/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/goldenmaster/modules/tb_names/CMakeLists.txt b/goldenmaster/modules/tb_names/CMakeLists.txt index 1bf90c154..41c34ce7e 100644 --- a/goldenmaster/modules/tb_names/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/CMakeLists.txt @@ -4,7 +4,7 @@ project(tb_names) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/tb_names/conan/conanfile.py b/goldenmaster/modules/tb_names/conan/conanfile.py index de88043ff..e760b7dab 100644 --- a/goldenmaster/modules/tb_names/conan/conanfile.py +++ b/goldenmaster/modules/tb_names/conan/conanfile.py @@ -44,7 +44,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt index 729dee0b7..21acf3efd 100644 --- a/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testtb_names) include(CTest) find_package(tb_names CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for tb_names diff --git a/goldenmaster/modules/tb_names/generated/api/CMakeLists.txt b/goldenmaster/modules/tb_names/generated/api/CMakeLists.txt index b3f40a9a6..081a20a2e 100644 --- a/goldenmaster/modules/tb_names/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_library(tb_names-api INTERFACE) add_library(tb_names::tb_names-api ALIAS tb_names-api) diff --git a/goldenmaster/modules/tb_names/generated/core/CMakeLists.txt b/goldenmaster/modules/tb_names/generated/core/CMakeLists.txt index 626cf6ac3..0946e3441 100644 --- a/goldenmaster/modules/tb_names/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/tb_names/generated/monitor/CMakeLists.txt b/goldenmaster/modules/tb_names/generated/monitor/CMakeLists.txt index 60b287411..77f22cfef 100644 --- a/goldenmaster/modules/tb_names/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/tb_names/generated/olink/CMakeLists.txt b/goldenmaster/modules/tb_names/generated/olink/CMakeLists.txt index 18934c8f1..7744655ac 100644 --- a/goldenmaster/modules/tb_names/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/tb_names/implementation/CMakeLists.txt b/goldenmaster/modules/tb_names/implementation/CMakeLists.txt index c3bcf73a4..74b38f3a2 100644 --- a/goldenmaster/modules/tb_names/implementation/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/goldenmaster/modules/tb_same1/CMakeLists.txt b/goldenmaster/modules/tb_same1/CMakeLists.txt index 370446718..1d8a074a9 100644 --- a/goldenmaster/modules/tb_same1/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/CMakeLists.txt @@ -4,7 +4,7 @@ project(tb_same1) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/tb_same1/conan/conanfile.py b/goldenmaster/modules/tb_same1/conan/conanfile.py index 5f8c0db2a..f9a579abb 100644 --- a/goldenmaster/modules/tb_same1/conan/conanfile.py +++ b/goldenmaster/modules/tb_same1/conan/conanfile.py @@ -44,7 +44,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt index 197c59d42..f630e4b7f 100644 --- a/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testtb_same1) include(CTest) find_package(tb_same1 CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for tb_same1 diff --git a/goldenmaster/modules/tb_same1/generated/api/CMakeLists.txt b/goldenmaster/modules/tb_same1/generated/api/CMakeLists.txt index 87f95be01..f82400c81 100644 --- a/goldenmaster/modules/tb_same1/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/modules/tb_same1/generated/core/CMakeLists.txt b/goldenmaster/modules/tb_same1/generated/core/CMakeLists.txt index f1a6913b5..76661dd70 100644 --- a/goldenmaster/modules/tb_same1/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/tb_same1/generated/monitor/CMakeLists.txt b/goldenmaster/modules/tb_same1/generated/monitor/CMakeLists.txt index 5dd5386c1..3a6b85d2e 100644 --- a/goldenmaster/modules/tb_same1/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/tb_same1/generated/olink/CMakeLists.txt b/goldenmaster/modules/tb_same1/generated/olink/CMakeLists.txt index 49cecd412..4e217e92f 100644 --- a/goldenmaster/modules/tb_same1/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/tb_same1/implementation/CMakeLists.txt b/goldenmaster/modules/tb_same1/implementation/CMakeLists.txt index 063199bab..98544bc41 100644 --- a/goldenmaster/modules/tb_same1/implementation/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/goldenmaster/modules/tb_same2/CMakeLists.txt b/goldenmaster/modules/tb_same2/CMakeLists.txt index 5d6a19b26..c287d7dc0 100644 --- a/goldenmaster/modules/tb_same2/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/CMakeLists.txt @@ -4,7 +4,7 @@ project(tb_same2) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/tb_same2/conan/conanfile.py b/goldenmaster/modules/tb_same2/conan/conanfile.py index f3739b5e5..dd1e32acf 100644 --- a/goldenmaster/modules/tb_same2/conan/conanfile.py +++ b/goldenmaster/modules/tb_same2/conan/conanfile.py @@ -44,7 +44,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt index 441f445bc..76259c78b 100644 --- a/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testtb_same2) include(CTest) find_package(tb_same2 CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for tb_same2 diff --git a/goldenmaster/modules/tb_same2/generated/api/CMakeLists.txt b/goldenmaster/modules/tb_same2/generated/api/CMakeLists.txt index ccf775531..cda134167 100644 --- a/goldenmaster/modules/tb_same2/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/modules/tb_same2/generated/core/CMakeLists.txt b/goldenmaster/modules/tb_same2/generated/core/CMakeLists.txt index 70145a3b5..48f4657e8 100644 --- a/goldenmaster/modules/tb_same2/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/tb_same2/generated/monitor/CMakeLists.txt b/goldenmaster/modules/tb_same2/generated/monitor/CMakeLists.txt index 5373c1692..8bc8618b0 100644 --- a/goldenmaster/modules/tb_same2/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/tb_same2/generated/olink/CMakeLists.txt b/goldenmaster/modules/tb_same2/generated/olink/CMakeLists.txt index 11ed542c7..b3a392aa8 100644 --- a/goldenmaster/modules/tb_same2/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/tb_same2/implementation/CMakeLists.txt b/goldenmaster/modules/tb_same2/implementation/CMakeLists.txt index 7403c43a2..4b3ea37c9 100644 --- a/goldenmaster/modules/tb_same2/implementation/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/goldenmaster/modules/tb_simple/CMakeLists.txt b/goldenmaster/modules/tb_simple/CMakeLists.txt index c68185037..b4b9f1862 100644 --- a/goldenmaster/modules/tb_simple/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/CMakeLists.txt @@ -4,7 +4,7 @@ project(tb_simple) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/tb_simple/conan/conanfile.py b/goldenmaster/modules/tb_simple/conan/conanfile.py index f804a5777..293734411 100644 --- a/goldenmaster/modules/tb_simple/conan/conanfile.py +++ b/goldenmaster/modules/tb_simple/conan/conanfile.py @@ -44,7 +44,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt index 23727d31b..73e6ab5e0 100644 --- a/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testtb_simple) include(CTest) find_package(tb_simple CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for tb_simple diff --git a/goldenmaster/modules/tb_simple/generated/api/CMakeLists.txt b/goldenmaster/modules/tb_simple/generated/api/CMakeLists.txt index 92ed15365..fd41052ec 100644 --- a/goldenmaster/modules/tb_simple/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_library(tb_simple-api INTERFACE) add_library(tb_simple::tb_simple-api ALIAS tb_simple-api) diff --git a/goldenmaster/modules/tb_simple/generated/core/CMakeLists.txt b/goldenmaster/modules/tb_simple/generated/core/CMakeLists.txt index a7cf921b3..f58797539 100644 --- a/goldenmaster/modules/tb_simple/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/tb_simple/generated/monitor/CMakeLists.txt b/goldenmaster/modules/tb_simple/generated/monitor/CMakeLists.txt index 6a9f1cc9b..22449aa37 100644 --- a/goldenmaster/modules/tb_simple/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/tb_simple/generated/olink/CMakeLists.txt b/goldenmaster/modules/tb_simple/generated/olink/CMakeLists.txt index dcd6584f0..4589ddb3d 100644 --- a/goldenmaster/modules/tb_simple/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/tb_simple/implementation/CMakeLists.txt b/goldenmaster/modules/tb_simple/implementation/CMakeLists.txt index 8de47f01c..29c54fc65 100644 --- a/goldenmaster/modules/tb_simple/implementation/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/goldenmaster/modules/testbed1/CMakeLists.txt b/goldenmaster/modules/testbed1/CMakeLists.txt index b8bc31544..0b6d0c5a8 100644 --- a/goldenmaster/modules/testbed1/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/CMakeLists.txt @@ -4,7 +4,7 @@ project(testbed1) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/testbed1/conan/conanfile.py b/goldenmaster/modules/testbed1/conan/conanfile.py index f10a040b5..0182bb1de 100644 --- a/goldenmaster/modules/testbed1/conan/conanfile.py +++ b/goldenmaster/modules/testbed1/conan/conanfile.py @@ -44,7 +44,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt b/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt index 84f9f63f3..b430e60e7 100644 --- a/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testtestbed1) include(CTest) find_package(testbed1 CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for testbed1 diff --git a/goldenmaster/modules/testbed1/generated/api/CMakeLists.txt b/goldenmaster/modules/testbed1/generated/api/CMakeLists.txt index b5a2c3022..013135eb1 100644 --- a/goldenmaster/modules/testbed1/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/modules/testbed1/generated/core/CMakeLists.txt b/goldenmaster/modules/testbed1/generated/core/CMakeLists.txt index 408447814..25ffb0fe1 100644 --- a/goldenmaster/modules/testbed1/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/testbed1/generated/monitor/CMakeLists.txt b/goldenmaster/modules/testbed1/generated/monitor/CMakeLists.txt index 9303e1f3b..444502d3e 100644 --- a/goldenmaster/modules/testbed1/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/testbed1/generated/olink/CMakeLists.txt b/goldenmaster/modules/testbed1/generated/olink/CMakeLists.txt index 7a1e26888..9c2210b02 100644 --- a/goldenmaster/modules/testbed1/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/testbed1/implementation/CMakeLists.txt b/goldenmaster/modules/testbed1/implementation/CMakeLists.txt index 31a20cb7b..ea88c593e 100644 --- a/goldenmaster/modules/testbed1/implementation/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/goldenmaster/modules/testbed2/CMakeLists.txt b/goldenmaster/modules/testbed2/CMakeLists.txt index 09fcb0c4f..bcdfb306f 100644 --- a/goldenmaster/modules/testbed2/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/CMakeLists.txt @@ -4,7 +4,7 @@ project(testbed2) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/goldenmaster/modules/testbed2/conan/conanfile.py b/goldenmaster/modules/testbed2/conan/conanfile.py index a6b157500..5af0c4ef2 100644 --- a/goldenmaster/modules/testbed2/conan/conanfile.py +++ b/goldenmaster/modules/testbed2/conan/conanfile.py @@ -44,7 +44,7 @@ def build_requirements(self): self.test_requires("catch2/2.13.7") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt b/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt index 72869a0b8..0869aa8c7 100644 --- a/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt @@ -3,7 +3,7 @@ project(Testtestbed2) include(CTest) find_package(testbed2 CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for testbed2 diff --git a/goldenmaster/modules/testbed2/generated/api/CMakeLists.txt b/goldenmaster/modules/testbed2/generated/api/CMakeLists.txt index 84ab6dc40..266af41ba 100644 --- a/goldenmaster/modules/testbed2/generated/api/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/generated/api/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/goldenmaster/modules/testbed2/generated/core/CMakeLists.txt b/goldenmaster/modules/testbed2/generated/core/CMakeLists.txt index de945c77e..47ee880fb 100644 --- a/goldenmaster/modules/testbed2/generated/core/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/generated/core/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/goldenmaster/modules/testbed2/generated/monitor/CMakeLists.txt b/goldenmaster/modules/testbed2/generated/monitor/CMakeLists.txt index bfe5c8632..a292aaba5 100644 --- a/goldenmaster/modules/testbed2/generated/monitor/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/generated/monitor/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/goldenmaster/modules/testbed2/generated/olink/CMakeLists.txt b/goldenmaster/modules/testbed2/generated/olink/CMakeLists.txt index 6dc346452..93bba3173 100644 --- a/goldenmaster/modules/testbed2/generated/olink/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/generated/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/goldenmaster/modules/testbed2/implementation/CMakeLists.txt b/goldenmaster/modules/testbed2/implementation/CMakeLists.txt index 6a41e649a..896b0979b 100644 --- a/goldenmaster/modules/testbed2/implementation/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/implementation/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) diff --git a/templates/CMakeLists.txt.tpl b/templates/CMakeLists.txt.tpl index a7afbac9e..4a8b813d2 100644 --- a/templates/CMakeLists.txt.tpl +++ b/templates/CMakeLists.txt.tpl @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.24) project({{lower1 (camel .System.Name)}}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # on Windows it is helpful to have all binary files next to each other diff --git a/templates/README.md b/templates/README.md index c876fb078..6f98f6743 100644 --- a/templates/README.md +++ b/templates/README.md @@ -1,6 +1,6 @@ -# C++ 14 Blueprint +# C++ 17 Blueprint -A pure C++ 14 blueprint with [CMake](https://cmake.org/) build system support. [Poco](https://pocoproject.org/) is used for network connections. The generated code can be enhanced with support for the [Conan](https://conan.io/) package manager. +A pure C++ 17 blueprint with [CMake](https://cmake.org/) build system support. [Poco](https://pocoproject.org/) is used for network connections. The generated code can be enhanced with support for the [Conan](https://conan.io/) package manager. ## Features The following list presents a set of features which can be individually enabled in the solution file for code generation. @@ -124,7 +124,7 @@ If you do not want or can not use conan, the poco libraries must installed separ ``` $ sudo apt install gcc-10 g++-10 git cmake libpoco-dev ``` -2. Set gcc-10 with C++14 support as default compiler +2. Set gcc-10 with C++17 support as default compiler ``` $ sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 10 --slave /usr/bin/g++ g++ /usr/bin/g++-10 diff --git a/templates/apigear/CMakeLists.txt b/templates/apigear/CMakeLists.txt index f315aee6b..08eb6d6b2 100644 --- a/templates/apigear/CMakeLists.txt +++ b/templates/apigear/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.20) project(apigear) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(apigear_COMPONENTS "") diff --git a/templates/apigear/conanfile.py b/templates/apigear/conanfile.py index a528c7bc2..784ab7e13 100644 --- a/templates/apigear/conanfile.py +++ b/templates/apigear/conanfile.py @@ -81,7 +81,7 @@ def build_requirements(self): self.test_requires("trompeloeil/46") def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/templates/apigear/olink/CMakeLists.txt b/templates/apigear/olink/CMakeLists.txt index fbcb98ebd..3faa66592 100644 --- a/templates/apigear/olink/CMakeLists.txt +++ b/templates/apigear/olink/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.20) project(poco-olink) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/templates/apigear/utilities/CMakeLists.txt b/templates/apigear/utilities/CMakeLists.txt index 4da6501f0..e3a8cd8cf 100644 --- a/templates/apigear/utilities/CMakeLists.txt +++ b/templates/apigear/utilities/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.20) project(utilities) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) diff --git a/templates/examples/app/CMakeLists.txt.tpl b/templates/examples/app/CMakeLists.txt.tpl index 6cb8b88c5..738b3ab1c 100644 --- a/templates/examples/app/CMakeLists.txt.tpl +++ b/templates/examples/app/CMakeLists.txt.tpl @@ -5,7 +5,7 @@ project(App) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/templates/examples/appthreadsafe/CMakeLists.txt.tpl b/templates/examples/appthreadsafe/CMakeLists.txt.tpl index 8fb96531d..ff2838ff3 100644 --- a/templates/examples/appthreadsafe/CMakeLists.txt.tpl +++ b/templates/examples/appthreadsafe/CMakeLists.txt.tpl @@ -4,7 +4,7 @@ project(AppThreadSafe) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/templates/examples/mqttclient/CMakeLists.txt.tpl b/templates/examples/mqttclient/CMakeLists.txt.tpl index dd9f7f8fd..f003a2880 100644 --- a/templates/examples/mqttclient/CMakeLists.txt.tpl +++ b/templates/examples/mqttclient/CMakeLists.txt.tpl @@ -4,7 +4,7 @@ project(MQTTClient) # append local binary directory for conan packages to be found set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/templates/examples/mqttserver/CMakeLists.txt.tpl b/templates/examples/mqttserver/CMakeLists.txt.tpl index 4c763b262..c59492015 100644 --- a/templates/examples/mqttserver/CMakeLists.txt.tpl +++ b/templates/examples/mqttserver/CMakeLists.txt.tpl @@ -4,7 +4,7 @@ project(MQTTServer) # append local binary directory for conan packages to be found set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/templates/examples/olinkclient/CMakeLists.txt.tpl b/templates/examples/olinkclient/CMakeLists.txt.tpl index 7678924df..694ebeb3b 100644 --- a/templates/examples/olinkclient/CMakeLists.txt.tpl +++ b/templates/examples/olinkclient/CMakeLists.txt.tpl @@ -5,7 +5,7 @@ project(OLinkClient) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/templates/examples/olinkserver/CMakeLists.txt.tpl b/templates/examples/olinkserver/CMakeLists.txt.tpl index 6e94c9166..67ab3aec2 100644 --- a/templates/examples/olinkserver/CMakeLists.txt.tpl +++ b/templates/examples/olinkserver/CMakeLists.txt.tpl @@ -4,7 +4,7 @@ project(OLinkServer) # append local binary directory for conan packages to be found list(APPEND CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR}/cmake) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set (SOURCES diff --git a/templates/module/CMakeLists.txt.tpl b/templates/module/CMakeLists.txt.tpl index 0ccc151ed..890f62e52 100644 --- a/templates/module/CMakeLists.txt.tpl +++ b/templates/module/CMakeLists.txt.tpl @@ -7,7 +7,7 @@ project({{$module_id}}) # needed to access CMAKE_INSTALL_LIBDIR include(GNUInstallDirs) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/templates/module/conan/conanfile.py.tpl b/templates/module/conan/conanfile.py.tpl index ca6d3d39e..22aed56d5 100644 --- a/templates/module/conan/conanfile.py.tpl +++ b/templates/module/conan/conanfile.py.tpl @@ -65,7 +65,7 @@ class {{$module_id}}Conan(ConanFile): {{- end }} def validate(self): - check_min_cppstd(self, "14") + check_min_cppstd(self, "17") def layout(self): cmake_layout(self) diff --git a/templates/module/conan/test_package/CMakeLists.txt.tpl b/templates/module/conan/test_package/CMakeLists.txt.tpl index a3fc20113..001940084 100644 --- a/templates/module/conan/test_package/CMakeLists.txt.tpl +++ b/templates/module/conan/test_package/CMakeLists.txt.tpl @@ -4,7 +4,7 @@ project(Test{{$module_id}}) include(CTest) find_package({{$module_id}} CONFIG REQUIRED) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # add test for {{$module_id}} diff --git a/templates/module/generated/api/CMakeLists.txt.tpl b/templates/module/generated/api/CMakeLists.txt.tpl index 2c9030e67..c25b3f8a3 100644 --- a/templates/module/generated/api/CMakeLists.txt.tpl +++ b/templates/module/generated/api/CMakeLists.txt.tpl @@ -4,7 +4,7 @@ {{- $SOURCES := printf "%s_SOURCES" $module_id -}} set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) {{- range .Module.Imports }} find_package({{snake .Name}} REQUIRED COMPONENTS api) diff --git a/templates/module/generated/core/CMakeLists.txt.tpl b/templates/module/generated/core/CMakeLists.txt.tpl index 75fb60f25..34ededa29 100644 --- a/templates/module/generated/core/CMakeLists.txt.tpl +++ b/templates/module/generated/core/CMakeLists.txt.tpl @@ -2,7 +2,7 @@ {{- $module_idFirstUpper := upper1 $module_id -}} set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(nlohmann_json REQUIRED) diff --git a/templates/module/generated/monitor/CMakeLists.txt.tpl b/templates/module/generated/monitor/CMakeLists.txt.tpl index a1ef376fa..c877c59da 100644 --- a/templates/module/generated/monitor/CMakeLists.txt.tpl +++ b/templates/module/generated/monitor/CMakeLists.txt.tpl @@ -2,7 +2,7 @@ {{- $module_idFirstUpper := upper1 $module_id -}} {{- $SOURCES := printf "%s_SOURCES" $module_id -}} -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-tracer) diff --git a/templates/module/generated/olink/CMakeLists.txt.tpl b/templates/module/generated/olink/CMakeLists.txt.tpl index 471c378d1..76ed093df 100644 --- a/templates/module/generated/olink/CMakeLists.txt.tpl +++ b/templates/module/generated/olink/CMakeLists.txt.tpl @@ -2,7 +2,7 @@ {{- $module_idFirstUpper := upper1 $module_id -}} {{- $SOURCES := printf "%s_SOURCES" $module_id -}} -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(apigear REQUIRED COMPONENTS poco-olink) diff --git a/templates/module/source/CMakeLists.txt.tpl b/templates/module/source/CMakeLists.txt.tpl index e527cc784..644e7c791 100644 --- a/templates/module/source/CMakeLists.txt.tpl +++ b/templates/module/source/CMakeLists.txt.tpl @@ -3,7 +3,7 @@ {{- $SOURCES := printf "%s_SOURCES" $module_id -}} set(CMAKE_POSITION_INDEPENDENT_CODE ON) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(THREADS_PREFER_PTHREAD_FLAG ON) From 37cd82adc9890aacf290ded138a2d20577316612 Mon Sep 17 00:00:00 2001 From: dorotaphanSiili <108282075+dorotaphanSiili@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:11:08 +0200 Subject: [PATCH 2/4] ci: make conan profile provide cpp 17 version --- .github/workflows/ci_build_test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci_build_test.yml b/.github/workflows/ci_build_test.yml index a117cae4f..824cf4ff5 100644 --- a/.github/workflows/ci_build_test.yml +++ b/.github/workflows/ci_build_test.yml @@ -52,6 +52,9 @@ jobs: run: pip install -r .github/workflows/conan-requirements.txt - name: Create default profile run: conan profile detect + - name: make sure the conan profile uses cpp17 on Windows + if: ${{ matrix.config.os == 'windows-latest'}} + run: sed -i 's/compiler.cppstd=14/compiler.cppstd=17/' ~/.conan2/profiles/default - run: cmake --version - name: Run conan build Linux/macOS if: ${{ matrix.config.os != 'windows-latest'}} From 36de207bc609cbc030c1ca8e250dc2a279392d3b Mon Sep 17 00:00:00 2001 From: dorotaphanSiili <108282075+dorotaphanSiili@users.noreply.github.com> Date: Thu, 17 Oct 2024 14:44:21 +0200 Subject: [PATCH 3/4] chores: update cmake version --- goldenmaster/apigear/CMakeLists.txt | 2 +- goldenmaster/apigear/olink/CMakeLists.txt | 2 +- goldenmaster/apigear/olink/tests/CMakeLists.txt | 2 +- goldenmaster/apigear/utilities/CMakeLists.txt | 2 +- goldenmaster/apigear/utilities/tests/CMakeLists.txt | 2 +- goldenmaster/examples/app/CMakeLists.txt | 2 +- goldenmaster/examples/appthreadsafe/CMakeLists.txt | 2 +- goldenmaster/examples/mqttclient/CMakeLists.txt | 2 +- goldenmaster/examples/mqttserver/CMakeLists.txt | 2 +- goldenmaster/examples/olinkclient/CMakeLists.txt | 2 +- goldenmaster/examples/olinkserver/CMakeLists.txt | 2 +- goldenmaster/modules/counter/CMakeLists.txt | 2 +- goldenmaster/modules/counter/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/custom_types/CMakeLists.txt | 2 +- .../modules/custom_types/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/extern_types/CMakeLists.txt | 2 +- .../modules/extern_types/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_enum/CMakeLists.txt | 2 +- goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_names/CMakeLists.txt | 2 +- goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same1/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same2/CMakeLists.txt | 2 +- goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/tb_simple/CMakeLists.txt | 2 +- .../modules/tb_simple/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/testbed1/CMakeLists.txt | 2 +- goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt | 2 +- goldenmaster/modules/testbed2/CMakeLists.txt | 2 +- goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt | 2 +- templates/apigear/CMakeLists.txt | 2 +- templates/apigear/olink/CMakeLists.txt | 2 +- templates/apigear/olink/tests/CMakeLists.txt | 2 +- templates/apigear/utilities/CMakeLists.txt | 2 +- templates/apigear/utilities/tests/CMakeLists.txt | 2 +- templates/examples/app/CMakeLists.txt.tpl | 2 +- templates/examples/appthreadsafe/CMakeLists.txt.tpl | 2 +- templates/examples/mqttclient/CMakeLists.txt.tpl | 2 +- templates/examples/mqttserver/CMakeLists.txt.tpl | 2 +- templates/examples/olinkclient/CMakeLists.txt.tpl | 2 +- templates/examples/olinkserver/CMakeLists.txt.tpl | 2 +- templates/module/CMakeLists.txt.tpl | 2 +- templates/module/conan/test_package/CMakeLists.txt.tpl | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/goldenmaster/apigear/CMakeLists.txt b/goldenmaster/apigear/CMakeLists.txt index 08eb6d6b2..3081b795c 100644 --- a/goldenmaster/apigear/CMakeLists.txt +++ b/goldenmaster/apigear/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(apigear) set(CMAKE_CXX_STANDARD 17) diff --git a/goldenmaster/apigear/olink/CMakeLists.txt b/goldenmaster/apigear/olink/CMakeLists.txt index 3faa66592..bfcb7a7ed 100644 --- a/goldenmaster/apigear/olink/CMakeLists.txt +++ b/goldenmaster/apigear/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(poco-olink) set(CMAKE_CXX_STANDARD 17) diff --git a/goldenmaster/apigear/olink/tests/CMakeLists.txt b/goldenmaster/apigear/olink/tests/CMakeLists.txt index 8b892d942..d25e317cd 100644 --- a/goldenmaster/apigear/olink/tests/CMakeLists.txt +++ b/goldenmaster/apigear/olink/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(test_poco_olink) set(SPDLOG_DEBUG_ON true) diff --git a/goldenmaster/apigear/utilities/CMakeLists.txt b/goldenmaster/apigear/utilities/CMakeLists.txt index e3a8cd8cf..d869977f9 100644 --- a/goldenmaster/apigear/utilities/CMakeLists.txt +++ b/goldenmaster/apigear/utilities/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(utilities) set(CMAKE_CXX_STANDARD 17) diff --git a/goldenmaster/apigear/utilities/tests/CMakeLists.txt b/goldenmaster/apigear/utilities/tests/CMakeLists.txt index ac42722d4..a2a67a057 100644 --- a/goldenmaster/apigear/utilities/tests/CMakeLists.txt +++ b/goldenmaster/apigear/utilities/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(test_apigear_utilities) set(SPDLOG_DEBUG_ON true) diff --git a/goldenmaster/examples/app/CMakeLists.txt b/goldenmaster/examples/app/CMakeLists.txt index b4a9f746b..28527ab01 100644 --- a/goldenmaster/examples/app/CMakeLists.txt +++ b/goldenmaster/examples/app/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(App) # append local binary directory for conan packages to be found diff --git a/goldenmaster/examples/appthreadsafe/CMakeLists.txt b/goldenmaster/examples/appthreadsafe/CMakeLists.txt index e06d83587..46c2681a4 100644 --- a/goldenmaster/examples/appthreadsafe/CMakeLists.txt +++ b/goldenmaster/examples/appthreadsafe/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(AppThreadSafe) # append local binary directory for conan packages to be found diff --git a/goldenmaster/examples/mqttclient/CMakeLists.txt b/goldenmaster/examples/mqttclient/CMakeLists.txt index c8b0c1e82..bdf03c52d 100644 --- a/goldenmaster/examples/mqttclient/CMakeLists.txt +++ b/goldenmaster/examples/mqttclient/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(MQTTClient) # append local binary directory for conan packages to be found diff --git a/goldenmaster/examples/mqttserver/CMakeLists.txt b/goldenmaster/examples/mqttserver/CMakeLists.txt index 29392b699..6a286be3b 100644 --- a/goldenmaster/examples/mqttserver/CMakeLists.txt +++ b/goldenmaster/examples/mqttserver/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(MQTTServer) # append local binary directory for conan packages to be found diff --git a/goldenmaster/examples/olinkclient/CMakeLists.txt b/goldenmaster/examples/olinkclient/CMakeLists.txt index 581d22adb..7226fe323 100644 --- a/goldenmaster/examples/olinkclient/CMakeLists.txt +++ b/goldenmaster/examples/olinkclient/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(OLinkClient) # append local binary directory for conan packages to be found diff --git a/goldenmaster/examples/olinkserver/CMakeLists.txt b/goldenmaster/examples/olinkserver/CMakeLists.txt index d37d8c4a0..bd76866a9 100644 --- a/goldenmaster/examples/olinkserver/CMakeLists.txt +++ b/goldenmaster/examples/olinkserver/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(OLinkServer) # append local binary directory for conan packages to be found diff --git a/goldenmaster/modules/counter/CMakeLists.txt b/goldenmaster/modules/counter/CMakeLists.txt index cd87bfbd6..d26ab55ac 100644 --- a/goldenmaster/modules/counter/CMakeLists.txt +++ b/goldenmaster/modules/counter/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(counter) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt b/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt index a1ef48cbc..8599ee5ce 100644 --- a/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testcounter) include(CTest) find_package(counter CONFIG REQUIRED) diff --git a/goldenmaster/modules/custom_types/CMakeLists.txt b/goldenmaster/modules/custom_types/CMakeLists.txt index 6517f2d84..42b9c496d 100644 --- a/goldenmaster/modules/custom_types/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(custom_types) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt b/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt index edb041681..49c0e6e42 100644 --- a/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testcustom_types) include(CTest) find_package(custom_types CONFIG REQUIRED) diff --git a/goldenmaster/modules/extern_types/CMakeLists.txt b/goldenmaster/modules/extern_types/CMakeLists.txt index 98b600ec1..238fe657f 100644 --- a/goldenmaster/modules/extern_types/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(extern_types) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt b/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt index c2606ea4d..32fcafb30 100644 --- a/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testextern_types) include(CTest) find_package(extern_types CONFIG REQUIRED) diff --git a/goldenmaster/modules/tb_enum/CMakeLists.txt b/goldenmaster/modules/tb_enum/CMakeLists.txt index 6358880de..7ca22b9c2 100644 --- a/goldenmaster/modules/tb_enum/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(tb_enum) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt index 21e83f2e5..adea3fb87 100644 --- a/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testtb_enum) include(CTest) find_package(tb_enum CONFIG REQUIRED) diff --git a/goldenmaster/modules/tb_names/CMakeLists.txt b/goldenmaster/modules/tb_names/CMakeLists.txt index 41c34ce7e..256782207 100644 --- a/goldenmaster/modules/tb_names/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(tb_names) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt index 21acf3efd..7bff18249 100644 --- a/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testtb_names) include(CTest) find_package(tb_names CONFIG REQUIRED) diff --git a/goldenmaster/modules/tb_same1/CMakeLists.txt b/goldenmaster/modules/tb_same1/CMakeLists.txt index 1d8a074a9..8a27a04d4 100644 --- a/goldenmaster/modules/tb_same1/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(tb_same1) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt index f630e4b7f..f06fccb1b 100644 --- a/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testtb_same1) include(CTest) find_package(tb_same1 CONFIG REQUIRED) diff --git a/goldenmaster/modules/tb_same2/CMakeLists.txt b/goldenmaster/modules/tb_same2/CMakeLists.txt index c287d7dc0..ff53669fb 100644 --- a/goldenmaster/modules/tb_same2/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(tb_same2) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt index 76259c78b..dcad1e54f 100644 --- a/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testtb_same2) include(CTest) find_package(tb_same2 CONFIG REQUIRED) diff --git a/goldenmaster/modules/tb_simple/CMakeLists.txt b/goldenmaster/modules/tb_simple/CMakeLists.txt index b4b9f1862..a9ce6eacf 100644 --- a/goldenmaster/modules/tb_simple/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(tb_simple) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt b/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt index 73e6ab5e0..ec6929bac 100644 --- a/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testtb_simple) include(CTest) find_package(tb_simple CONFIG REQUIRED) diff --git a/goldenmaster/modules/testbed1/CMakeLists.txt b/goldenmaster/modules/testbed1/CMakeLists.txt index 0b6d0c5a8..2b0afaebb 100644 --- a/goldenmaster/modules/testbed1/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(testbed1) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt b/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt index b430e60e7..9d328a5ee 100644 --- a/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testtestbed1) include(CTest) find_package(testbed1 CONFIG REQUIRED) diff --git a/goldenmaster/modules/testbed2/CMakeLists.txt b/goldenmaster/modules/testbed2/CMakeLists.txt index bcdfb306f..9e484912a 100644 --- a/goldenmaster/modules/testbed2/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(testbed2) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt b/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt index 0869aa8c7..9a93484cd 100644 --- a/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Testtestbed2) include(CTest) find_package(testbed2 CONFIG REQUIRED) diff --git a/templates/apigear/CMakeLists.txt b/templates/apigear/CMakeLists.txt index 08eb6d6b2..3081b795c 100644 --- a/templates/apigear/CMakeLists.txt +++ b/templates/apigear/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(apigear) set(CMAKE_CXX_STANDARD 17) diff --git a/templates/apigear/olink/CMakeLists.txt b/templates/apigear/olink/CMakeLists.txt index 3faa66592..bfcb7a7ed 100644 --- a/templates/apigear/olink/CMakeLists.txt +++ b/templates/apigear/olink/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(poco-olink) set(CMAKE_CXX_STANDARD 17) diff --git a/templates/apigear/olink/tests/CMakeLists.txt b/templates/apigear/olink/tests/CMakeLists.txt index 8b892d942..d25e317cd 100644 --- a/templates/apigear/olink/tests/CMakeLists.txt +++ b/templates/apigear/olink/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(test_poco_olink) set(SPDLOG_DEBUG_ON true) diff --git a/templates/apigear/utilities/CMakeLists.txt b/templates/apigear/utilities/CMakeLists.txt index e3a8cd8cf..d869977f9 100644 --- a/templates/apigear/utilities/CMakeLists.txt +++ b/templates/apigear/utilities/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(utilities) set(CMAKE_CXX_STANDARD 17) diff --git a/templates/apigear/utilities/tests/CMakeLists.txt b/templates/apigear/utilities/tests/CMakeLists.txt index ac42722d4..a2a67a057 100644 --- a/templates/apigear/utilities/tests/CMakeLists.txt +++ b/templates/apigear/utilities/tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(test_apigear_utilities) set(SPDLOG_DEBUG_ON true) diff --git a/templates/examples/app/CMakeLists.txt.tpl b/templates/examples/app/CMakeLists.txt.tpl index 738b3ab1c..3aa31fea1 100644 --- a/templates/examples/app/CMakeLists.txt.tpl +++ b/templates/examples/app/CMakeLists.txt.tpl @@ -1,5 +1,5 @@ {{- $features := .Features -}} -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(App) # append local binary directory for conan packages to be found diff --git a/templates/examples/appthreadsafe/CMakeLists.txt.tpl b/templates/examples/appthreadsafe/CMakeLists.txt.tpl index ff2838ff3..a8cee2305 100644 --- a/templates/examples/appthreadsafe/CMakeLists.txt.tpl +++ b/templates/examples/appthreadsafe/CMakeLists.txt.tpl @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(AppThreadSafe) # append local binary directory for conan packages to be found diff --git a/templates/examples/mqttclient/CMakeLists.txt.tpl b/templates/examples/mqttclient/CMakeLists.txt.tpl index f003a2880..80bd398d0 100644 --- a/templates/examples/mqttclient/CMakeLists.txt.tpl +++ b/templates/examples/mqttclient/CMakeLists.txt.tpl @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(MQTTClient) # append local binary directory for conan packages to be found diff --git a/templates/examples/mqttserver/CMakeLists.txt.tpl b/templates/examples/mqttserver/CMakeLists.txt.tpl index c59492015..f6e6cccf4 100644 --- a/templates/examples/mqttserver/CMakeLists.txt.tpl +++ b/templates/examples/mqttserver/CMakeLists.txt.tpl @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(MQTTServer) # append local binary directory for conan packages to be found diff --git a/templates/examples/olinkclient/CMakeLists.txt.tpl b/templates/examples/olinkclient/CMakeLists.txt.tpl index 694ebeb3b..fc2eff05a 100644 --- a/templates/examples/olinkclient/CMakeLists.txt.tpl +++ b/templates/examples/olinkclient/CMakeLists.txt.tpl @@ -1,5 +1,5 @@ {{- $features := .Features -}} -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(OLinkClient) # append local binary directory for conan packages to be found diff --git a/templates/examples/olinkserver/CMakeLists.txt.tpl b/templates/examples/olinkserver/CMakeLists.txt.tpl index 67ab3aec2..3b946f984 100644 --- a/templates/examples/olinkserver/CMakeLists.txt.tpl +++ b/templates/examples/olinkserver/CMakeLists.txt.tpl @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(OLinkServer) # append local binary directory for conan packages to be found diff --git a/templates/module/CMakeLists.txt.tpl b/templates/module/CMakeLists.txt.tpl index 890f62e52..f13a8eeb4 100644 --- a/templates/module/CMakeLists.txt.tpl +++ b/templates/module/CMakeLists.txt.tpl @@ -1,7 +1,7 @@ {{- $module_id := snake .Module.Name -}} {{- $module_idFirstUpper := upper1 $module_id -}} {{- $features := .Features -}} -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project({{$module_id}}) # needed to access CMAKE_INSTALL_LIBDIR diff --git a/templates/module/conan/test_package/CMakeLists.txt.tpl b/templates/module/conan/test_package/CMakeLists.txt.tpl index 001940084..249dfa7a1 100644 --- a/templates/module/conan/test_package/CMakeLists.txt.tpl +++ b/templates/module/conan/test_package/CMakeLists.txt.tpl @@ -1,5 +1,5 @@ {{- $module_id := snake .Module.Name -}} -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) project(Test{{$module_id}}) include(CTest) find_package({{$module_id}} CONFIG REQUIRED) From 4c571395aa70ba83fe5cd4010c0b2ad541822bb2 Mon Sep 17 00:00:00 2001 From: dorotaphanSiili <108282075+dorotaphanSiili@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:10:14 +0200 Subject: [PATCH 4/4] docs: add tip for conan feature the conan profile by default may provide inaccurate settings. For windows it often sets cpp version to 14, where for this project the 17 is the minimal required version. The profile is dependent on the user environment and cannot be provided by apigear, hence we chose to add this information in documentation. --- docs/docs/features/conan.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/docs/features/conan.md b/docs/docs/features/conan.md index cd1bad9b3..9283b27d8 100644 --- a/docs/docs/features/conan.md +++ b/docs/docs/features/conan.md @@ -8,6 +8,9 @@ import helloWorldModuleComponent from '!!raw-loader!./data/helloworld.module.yam With this feature you we generate a conan support for your project. It helps with packaging and to managing dependencies for different platforms, OSs, compilers, architecture, cross-builds. Read more about conan and its all benefits [here](https://conan.io/). +::tip:: +Make sure your conan profile has all the required settings set to desired values e.g. the cpp standard set to 17. +::: ### File overview for module