Skip to content

Commit e54c17a

Browse files
authored
Merge pull request #618 from mtconnect/617_address_create_time_resolution
617 address create time resolution
2 parents 7a15fbf + dd747a5 commit e54c17a

250 files changed

Lines changed: 3775 additions & 3483 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# The version number.
22
set(AGENT_VERSION_MAJOR 2)
3-
set(AGENT_VERSION_MINOR 7)
3+
set(AGENT_VERSION_MINOR 8)
44
set(AGENT_VERSION_PATCH 0)
5-
set(AGENT_VERSION_BUILD 13)
5+
set(AGENT_VERSION_BUILD 1)
66
set(AGENT_VERSION_RC "")
77

88
# This minimum version is to support Visual Studio 2019 and C++ feature checking and FetchContent
@@ -27,7 +27,6 @@ set(CMAKE_CXX_STANDARD 20)
2727
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2828
set(CMAKE_CXX_EXTENSIONS OFF)
2929
set(CXX_COMPILE_FEATURES cxx_std_20)
30-
set(CMAKE_OSX_DEPLOYMENT_TARGET 15.0)
3130

3231
project(cppagent LANGUAGES C CXX)
3332

‎conan/profiles/macos‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ include(default)
33
[settings]
44
compiler=apple-clang
55
compiler.cppstd=20
6-
os.version=15.0
76

87
[platform_tool_requires]
9-
cmake/>3.26.0
8+
cmake/>4.0
109

1110

1211

‎conan/profiles/vs32‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ compiler.runtime=static
88
compiler.runtime_type=Release
99
build_type=Release
1010

11+
[platform_tool_requires]
12+
cmake/>4.3
13+
14+
[replace_tool_requires]
15+
cmake/*: cmake/>4.3

‎conan/profiles/vs32debug‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,11 @@ arch=x86
77
compiler.runtime=static
88
compiler.runtime_type=Debug
99
build_type=Debug
10+
11+
12+
13+
[platform_tool_requires]
14+
cmake/>4.3
15+
16+
[replace_tool_requires]
17+
cmake/*: cmake/>4.3

‎conan/profiles/vs32shared‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,8 @@ compiler.runtime=dynamic
88
compiler.runtime_type=Release
99
build_type=Release
1010

11+
[platform_tool_requires]
12+
cmake/>4.3
13+
14+
[replace_tool_requires]
15+
cmake/*: cmake/>4.3

‎conan/profiles/vs64‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@ arch=x86_64
77
compiler.runtime=static
88
compiler.runtime_type=Release
99
build_type=Release
10+
11+
[platform_tool_requires]
12+
cmake/>4.3
13+
14+
[replace_tool_requires]
15+
cmake/*: cmake/>4.3

‎conan/profiles/vs64debug‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@ arch=x86_64
77
compiler.runtime=static
88
compiler.runtime_type=Debug
99
build_type=Debug
10+
11+
[platform_tool_requires]
12+
cmake/>4.3
13+
14+
[replace_tool_requires]
15+
cmake/*: cmake/>4.3

‎conan/profiles/vs64shared‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,8 @@ build_type=Release
1111
[options]
1212
shared=True
1313

14+
[platform_tool_requires]
15+
cmake/>4.3
16+
17+
[replace_tool_requires]
18+
cmake/*: cmake/>4.3

0 commit comments

Comments
 (0)