Skip to content

Commit f56b8c5

Browse files
authored
Merge branch 'main' into feature/switch
2 parents 67c7615 + 62d40eb commit f56b8c5

File tree

22 files changed

+3596
-757
lines changed

22 files changed

+3596
-757
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
sudo echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null
145145
146146
apt-get update
147-
apt-get -y install cmake
147+
apt-get -y install cmake=3.25.2-0kitware1ubuntu22.04.1 cmake-data=3.25.2-0kitware1ubuntu22.04.1
148148
149149
- name: Setup build directory
150150
run: mkdir builds

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# constrained by the version of CMake available on target systems.
3535
cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
3636

37-
set(CMAKE_PROJECT_VERSION 0.5.0)
37+
set(CMAKE_PROJECT_VERSION 0.6.0)
3838

3939
# Identify the project.
4040
project(viam-cpp-sdk
@@ -150,6 +150,10 @@ if (VIAMCPPSDK_ENFORCE_COMPILER_MINIMA)
150150
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)
151151
message(FATAL_ERROR "Insufficient Apple clang version: XCode 10.0+ required")
152152
endif()
153+
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
154+
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 19.34)
155+
message(FATAL_ERROR "Insufficient MSVC version: Visual Studio 2022 17.4 (MSVC 19.34) or later is required")
156+
endif()
153157
else()
154158
message(FATAL_ERROR "Unknown / untested compiler ${CMAKE_CXX_COMPILER_ID}")
155159
endif()

src/viam/api/api_proto_tag.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.1.413
1+
v0.1.417

src/viam/api/app/v1/app.pb.cc

Lines changed: 1059 additions & 676 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/viam/api/app/v1/app.pb.h

Lines changed: 528 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/viam/api/app/v1/billing.grpc.pb.cc

Lines changed: 94 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)