diff --git a/.github/workflows/ci_build_test.yml b/.github/workflows/ci_build_test.yml index a117cae4..824cf4ff 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'}} diff --git a/README.md b/README.md index 96e56fc7..ebf67ab2 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/conan.md b/docs/docs/features/conan.md index cd1bad9b..9283b27d 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 diff --git a/docs/docs/features/data/example/CMakeLists.txt b/docs/docs/features/data/example/CMakeLists.txt index f0f6398c..8a930a7a 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 c661b4d2..0205fb6e 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 800290bf..ab01eadd 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 51fff46f..985f3df1 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 0a817af4..255ce9e9 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 c876fb07..6f98f674 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 f315aee6..3081b795 100644 --- a/goldenmaster/apigear/CMakeLists.txt +++ b/goldenmaster/apigear/CMakeLists.txt @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 a528c7bc..784ab7e1 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 fbcb98eb..bfcb7a7e 100644 --- a/goldenmaster/apigear/olink/CMakeLists.txt +++ b/goldenmaster/apigear/olink/CMakeLists.txt @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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/olink/tests/CMakeLists.txt b/goldenmaster/apigear/olink/tests/CMakeLists.txt index 8b892d94..d25e317c 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 4da6501f..d869977f 100644 --- a/goldenmaster/apigear/utilities/CMakeLists.txt +++ b/goldenmaster/apigear/utilities/CMakeLists.txt @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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/apigear/utilities/tests/CMakeLists.txt b/goldenmaster/apigear/utilities/tests/CMakeLists.txt index ac42722d..a2a67a05 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 96f79307..28527ab0 100644 --- a/goldenmaster/examples/app/CMakeLists.txt +++ b/goldenmaster/examples/app/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 1c315cc0..46c2681a 100644 --- a/goldenmaster/examples/appthreadsafe/CMakeLists.txt +++ b/goldenmaster/examples/appthreadsafe/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 2a16d43a..bdf03c52 100644 --- a/goldenmaster/examples/mqttclient/CMakeLists.txt +++ b/goldenmaster/examples/mqttclient/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 836d39a9..6a286be3 100644 --- a/goldenmaster/examples/mqttserver/CMakeLists.txt +++ b/goldenmaster/examples/mqttserver/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 c24560f4..7226fe32 100644 --- a/goldenmaster/examples/olinkclient/CMakeLists.txt +++ b/goldenmaster/examples/olinkclient/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 e92f36cb..bd76866a 100644 --- a/goldenmaster/examples/olinkserver/CMakeLists.txt +++ b/goldenmaster/examples/olinkserver/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 a4854ad2..d26ab55a 100644 --- a/goldenmaster/modules/counter/CMakeLists.txt +++ b/goldenmaster/modules/counter/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 01f0466c..33c18142 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 e633897a..8599ee5c 100644 --- a/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/counter/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 b9ca0fe7..4d7ad64c 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 f9ab275a..53fd497d 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 45a92609..35f31b82 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 c34b0ab9..bca91528 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 c835a649..671f9447 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 e53ff20b..42b9c496 100644 --- a/goldenmaster/modules/custom_types/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 49b023bb..e699ca6f 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 aa7276e5..49c0e6e4 100644 --- a/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/custom_types/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 155cd0d8..395a6678 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 ccfbe9d1..b6c0b9d9 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 c77040df..6e0f77b1 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 9435d0a2..d101dc59 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 33cc2efe..07de5928 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 52961aa5..238fe657 100644 --- a/goldenmaster/modules/extern_types/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 d45d8b15..eb9cada5 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 af553d2a..32fcafb3 100644 --- a/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/extern_types/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 4565e052..58b68d72 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 5038edf9..961b97bf 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 663caf34..54b8d31c 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 e8369fb3..4d8c6d05 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 a1477b7c..2c1aa795 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 089f7806..7ca22b9c 100644 --- a/goldenmaster/modules/tb_enum/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 6b1b2430..04642022 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 16444b7b..adea3fb8 100644 --- a/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_enum/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 7b083c25..c6b78501 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 996d8319..efda57b0 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 48d5abba..2f29d7bc 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 4da9b003..470a9b79 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 47ce4e7a..220171ba 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 1bf90c15..25678220 100644 --- a/goldenmaster/modules/tb_names/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 de88043f..e760b7da 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 729dee0b..7bff1824 100644 --- a/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_names/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 b3f40a9a..081a20a2 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 626cf6ac..0946e344 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 60b28741..77f22cfe 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 18934c8f..7744655a 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 c3bcf73a..74b38f3a 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 37044671..8a27a04d 100644 --- a/goldenmaster/modules/tb_same1/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 5f8c0db2..f9a579ab 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 197c59d4..f06fccb1 100644 --- a/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_same1/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 87f95be0..f82400c8 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 f1a6913b..76661dd7 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 5dd5386c..3a6b85d2 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 49cecd41..4e217e92 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 063199ba..98544bc4 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 5d6a19b2..ff53669f 100644 --- a/goldenmaster/modules/tb_same2/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 f3739b5e..dd1e32ac 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 441f445b..dcad1e54 100644 --- a/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_same2/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 ccf77553..cda13416 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 70145a3b..48f4657e 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 5373c169..8bc8618b 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 11ed542c..b3a392aa 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 7403c43a..4b3ea37c 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 c6818503..a9ce6eac 100644 --- a/goldenmaster/modules/tb_simple/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 f804a577..29373441 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 23727d31..ec6929ba 100644 --- a/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/tb_simple/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 92ed1536..fd41052e 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 a7cf921b..f5879753 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 6a9f1cc9..22449aa3 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 dcd6584f..4589ddb3 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 8de47f01..29c54fc6 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 b8bc3154..2b0afaeb 100644 --- a/goldenmaster/modules/testbed1/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 f10a040b..0182bb1d 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 84f9f63f..9d328a5e 100644 --- a/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/testbed1/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 b5a2c302..013135eb 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 40844781..25ffb0fe 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 9303e1f3..444502d3 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 7a1e2688..9c2210b0 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 31a20cb7..ea88c593 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 09fcb0c4..9e484912 100644 --- a/goldenmaster/modules/testbed2/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/CMakeLists.txt @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 a6b15750..5af0c4ef 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 72869a0b..9a93484c 100644 --- a/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt +++ b/goldenmaster/modules/testbed2/conan/test_package/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 84ab6dc4..266af41b 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 de945c77..47ee880f 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 bfe5c863..a292aaba 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 6dc34645..93bba317 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 6a41e649..896b0979 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 a7afbac9..4a8b813d 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 c876fb07..6f98f674 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 f315aee6..3081b795 100644 --- a/templates/apigear/CMakeLists.txt +++ b/templates/apigear/CMakeLists.txt @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 a528c7bc..784ab7e1 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 fbcb98eb..bfcb7a7e 100644 --- a/templates/apigear/olink/CMakeLists.txt +++ b/templates/apigear/olink/CMakeLists.txt @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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/olink/tests/CMakeLists.txt b/templates/apigear/olink/tests/CMakeLists.txt index 8b892d94..d25e317c 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 4da6501f..d869977f 100644 --- a/templates/apigear/utilities/CMakeLists.txt +++ b/templates/apigear/utilities/CMakeLists.txt @@ -1,7 +1,7 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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/apigear/utilities/tests/CMakeLists.txt b/templates/apigear/utilities/tests/CMakeLists.txt index ac42722d..a2a67a05 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 6cb8b88c..3aa31fea 100644 --- a/templates/examples/app/CMakeLists.txt.tpl +++ b/templates/examples/app/CMakeLists.txt.tpl @@ -1,11 +1,11 @@ {{- $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 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 8fb96531..a8cee230 100644 --- a/templates/examples/appthreadsafe/CMakeLists.txt.tpl +++ b/templates/examples/appthreadsafe/CMakeLists.txt.tpl @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 dd9f7f8f..80bd398d 100644 --- a/templates/examples/mqttclient/CMakeLists.txt.tpl +++ b/templates/examples/mqttclient/CMakeLists.txt.tpl @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 4c763b26..f6e6cccf 100644 --- a/templates/examples/mqttserver/CMakeLists.txt.tpl +++ b/templates/examples/mqttserver/CMakeLists.txt.tpl @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 7678924d..fc2eff05 100644 --- a/templates/examples/olinkclient/CMakeLists.txt.tpl +++ b/templates/examples/olinkclient/CMakeLists.txt.tpl @@ -1,11 +1,11 @@ {{- $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 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 6e94c916..3b946f98 100644 --- a/templates/examples/olinkserver/CMakeLists.txt.tpl +++ b/templates/examples/olinkserver/CMakeLists.txt.tpl @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.20) +cmake_minimum_required(VERSION 3.24) 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 0ccc151e..f13a8eeb 100644 --- a/templates/module/CMakeLists.txt.tpl +++ b/templates/module/CMakeLists.txt.tpl @@ -1,13 +1,13 @@ {{- $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 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 ca6d3d39..22aed56d 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 a3fc2011..249dfa7a 100644 --- a/templates/module/conan/test_package/CMakeLists.txt.tpl +++ b/templates/module/conan/test_package/CMakeLists.txt.tpl @@ -1,10 +1,10 @@ {{- $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) -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 2c9030e6..c25b3f8a 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 75fb60f2..34ededa2 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 a1ef376f..c877c59d 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 471c378d..76ed093d 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 e527cc78..644e7c79 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)