Merge pull request #570 from mtconnect/migrate_to_cpp_version_20

Migrate to cpp version 20, upgrade to boost 1.88, and update other dependencies.

Author: wsobel

.github/workflows/build.yml

@@ -28,8 +28,8 @@ on:
 
 jobs:
   build_windows:
-    runs-on: windows-2022
-    name: "Windows 2022 Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
+    runs-on: windows-latest
+    name: "Windows latest Arch: ${{ matrix.arch }}, Shared: ${{ matrix.shared }}"
     strategy:
       matrix:
         arch: ["x86", "amd64"]

CMakeLists.txt

@@ -2,7 +2,7 @@
 set(AGENT_VERSION_MAJOR 2)
 set(AGENT_VERSION_MINOR 6)
 set(AGENT_VERSION_PATCH 0)
-set(AGENT_VERSION_BUILD 2)
+set(AGENT_VERSION_BUILD 3)
 set(AGENT_VERSION_RC "")
 
 # This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent
@@ -22,13 +22,14 @@ set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/mtconnect")
 
 message(INFO " Shared build: ${SHARED_AGENT_LIB}")
 
-project(cppagent LANGUAGES C CXX)
-
 # We will define these properties by default for each CMake target to be created.
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CXX_COMPILE_FEATURES cxx_std_17)
+set(CXX_COMPILE_FEATURES cxx_std_20)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3)
+
+project(cppagent LANGUAGES C CXX)
 
 set(WITH_RUBY ON CACHE STRING "With Ruby Support")
 

agent/cppagent.cpp

@@ -1,5 +1,5 @@
 //
-// Copyright Copyright 2009-2024, AMT – The Association For Manufacturing Technology (“AMT”)
+// Copyright Copyright 2009-2025, AMT – The Association For Manufacturing Technology (“AMT”)
 // All rights reserved.
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");

conan/mqtt_cpp/conanfile.py

@@ -4,13 +4,13 @@
 
 class MqttcppConan(ConanFile):
     name = "mqtt_cpp"
-    version = "13.2.1"
+    version = "13.2.2"
     license = "Boost Software License, Version 1.0"
     author = "Takatoshi Kondo redboltz@gmail.com"
     url = "https://github.com/redboltz/mqtt_cpp"
     description = "MQTT client/server for C++14 based on Boost.Asio"
     topics = ("mqtt")
-    requires = ["boost/1.85.0"]
+    requires = ["boost/1.88.0"]
     no_copy_source = True
     exports_sources = "include/*"
 

conan/mruby/conanfile.py

@@ -155,7 +155,7 @@ def search_header_path(name)
             if is_msvc(self):
                 if self.settings.build_type == 'Debug':
                     f.write("  conf.compilers.each { |c|  c.flags << '/Od' }\n")
-                f.write("  conf.compilers.each { |c| c.flags << '/std:c++17' }\n")
+                f.write("  conf.compilers.each { |c| c.flags << '/std:c++20' }\n")
                 f.write("  conf.compilers.each { |c| c.flags << '/%s' }\n" % msvc_runtime_flag(self))
             else:
                 if self.settings.build_type == 'Debug':

conan/profiles/clang

@@ -2,6 +2,7 @@ include(default)
 
 [settings]
 compiler.libcxx=libstdc++11
+compiler.cppstd=20
 
 [env]
 CC=/usr/bin/clang

conan/profiles/docker

@@ -2,6 +2,7 @@ include(default)
 
 [settings]
 compiler.libcxx=libstdc++11
+compiler.cppstd=20
 
 [options]
 without_ipv6=True

conan/profiles/gcc

@@ -2,6 +2,7 @@ include(default)
 
 [settings]
 compiler.libcxx=libstdc++11
+compiler.cppstd=20
 
 [system_tools]
 cmake/>3.23.0

conan/profiles/macos

@@ -2,7 +2,7 @@ include(default)
 
 [settings]
 compiler=apple-clang
-compiler.cppstd=gnu17
+compiler.cppstd=20
 
 [system_tools]
 cmake/>3.26.0

conan/profiles/vs32

@@ -2,11 +2,9 @@ include(default)
 
 [settings]
 compiler=msvc
-compiler.cppstd=17
+compiler.cppstd=20
 arch=x86
 compiler.runtime=static
 compiler.runtime_type=Release
 build_type=Release
 
-[options]
-winver=0x0600