Skip to content

Commit f33d335

Browse files
authored
Fix conan build breakage from buf v2 upgrade (#539)
1 parent 1b8c81a commit f33d335

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

conanfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ViamCppSdkRecipe(ConanFile):
2626
"shared": True
2727
}
2828

29-
exports_sources = "CMakeLists.txt", "LICENSE", "src/*"
29+
exports_sources = "CMakeLists.txt", "LICENSE", "src/*", "buf.lock"
3030

3131
def set_version(self):
3232
content = load(self, "CMakeLists.txt")
@@ -46,13 +46,13 @@ def configure(self):
4646
def _xtensor_requires(self):
4747
if valid_max_cppstd(self, 14, False):
4848
return 'xtensor/[>=0.24.3 <0.26.0]'
49-
49+
5050
return 'xtensor/[>=0.24.3]'
5151

5252
def _grpc_requires(self):
5353
if valid_max_cppstd(self, 14, False):
5454
return 'grpc/[>=1.48.4 <1.70.0]'
55-
55+
5656
return 'grpc/[>=1.48.4]'
5757

5858
def requirements(self):

src/viam/api/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(PROTO_GEN_DIR ${CMAKE_CURRENT_SOURCE_DIR})
44
if (VIAMCPPSDK_USE_DYNAMIC_PROTOS)
55
# reads in buf.lock and grabs the commit hashes supported by this version of C++ SDK
66
if (NOT EXISTS ${PROJECT_SOURCE_DIR}/buf.lock)
7-
message(FATAL_ERROR "No `buf.lock` file was found in the src/viam/api directory")
7+
message(FATAL_ERROR "No `buf.lock` file was found in the project source directory")
88
endif()
99
file(READ ${PROJECT_SOURCE_DIR}/buf.lock lockfile)
1010

0 commit comments

Comments
 (0)