Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded C++ Version to 20 and Visual Studio to 2022 #490

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
upgrade gtest to 1.15 and fixed macos build issue
wsobel committed Sep 23, 2024
commit 46fe7d78076323de9f6c67125341e56cabb154ad
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -21,14 +21,15 @@ set(AGENT_PREFIX "" CACHE STRING "Prefix for the name of the agent and the agent
set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/mtconnect")

message(INFO " Shared build: ${SHARED_AGENT_LIB}")
set(CMAKE_OSX_DEPLOYMENT_TARGET 13.2)

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(WITH_RUBY ON CACHE STRING "With Ruby Support")

1 change: 1 addition & 0 deletions conan/profiles/macos
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ include(default)
[settings]
compiler=apple-clang
compiler.cppstd=20
os.version=14.0

[system_tools]
cmake/>3.26.0
1 change: 1 addition & 0 deletions conan/profiles/xcode
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@ include(default)

[settings]
compiler.cppstd=20
os.version=14.0

[system_tools]
cmake/>3.23.0
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
@@ -130,7 +130,7 @@ def requirements(self):
if self.options.with_ruby:
self.requires("mruby/3.2.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True)

self.requires("gtest/1.10.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True, test=True)
self.requires("gtest/1.15.0", headers=True, libs=True, transitive_headers=True, transitive_libs=True, test=True)

def configure(self):
if self.options.shared: