Skip to content

Commit 777f1fd

Browse files
authored
fix conan for c++17 deps (#440)
1 parent e834a64 commit 777f1fd

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: Test
22

33
on:
44
pull_request:
5+
paths-ignore:
6+
- conanfile.py
7+
- '**.md'
58
workflow_dispatch:
69
inputs:
710
no-tidy:

conanfile.py

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,31 @@ def configure(self):
4242
for lib in ["grpc", "protobuf", "abseil"]:
4343
self.options[lib].shared = True
4444

45+
def _xtensor_requires(self):
46+
if self.settings.compiler.cppstd in ["14", "gnu14"]:
47+
return 'xtensor/[>=0.24.3 <0.26.0]'
48+
49+
return 'xtensor/[>=0.24.3]'
50+
51+
def _grpc_requires(self):
52+
if self.settings.compiler.cppstd in ["14", "gnu14"]:
53+
return 'grpc/[>=1.48.4 <1.70.0]'
54+
55+
return 'grpc/[>=1.48.4]'
56+
4557
def requirements(self):
4658
self.requires('boost/[>=1.74.0]', transitive_headers=True)
4759

4860
# The SDK supports older grpc and protobuf, but these are the oldest
4961
# maintained conan packages.
50-
self.requires('grpc/[>=1.48.4]')
51-
self.requires('protobuf/[>=3.17.1]')
52-
self.requires('xtensor/[>=0.24.3]', transitive_headers=True)
62+
self.requires(self._grpc_requires())
63+
self.requires('protobuf/[>=3.17.1 <6.30.0]')
64+
self.requires(self._xtensor_requires(), transitive_headers=True)
5365

5466
def build_requirements(self):
5567
if self.options.offline_proto_generation:
56-
self.tool_requires('grpc/[>=1.48.4]')
57-
self.tool_requires('protobuf/[>=3.17.1]')
68+
self.tool_requires(self._grpc_requires())
69+
self.tool_requires('protobuf/[>=3.17.1 <6.30.0]')
5870

5971
def layout(self):
6072
cmake_layout(self)

0 commit comments

Comments
 (0)