Skip to content

Commit

Permalink
upgrade gtest to 1.15 and fixed macos build issue
Browse files Browse the repository at this point in the history
  • Loading branch information
wsobel committed Sep 23, 2024
1 parent 1c18e31 commit 46fe7d7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
1 change: 1 addition & 0 deletions conan/profiles/macos
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Up @@ -2,6 +2,7 @@ include(default)

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

[system_tools]
cmake/>3.23.0
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 46fe7d7

Please sign in to comment.