Skip to content

Commit c5a854e

Browse files
authored
RSDK-10313: Full conan fix (#390)
1 parent fcfa076 commit c5a854e

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/conan.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
paths:
1212
- conanfile.py
1313
- test_package/conanfile.py
14+
- .github/workflows/conan.yml
1415

1516
jobs:
1617
prepare:
@@ -100,6 +101,8 @@ jobs:
100101
apt-get update
101102
apt-get -y dist-upgrade
102103
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
104+
autoconf \
105+
automake \
103106
build-essential \
104107
ca-certificates \
105108
curl \
@@ -120,15 +123,15 @@ jobs:
120123
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
121124
122125
apt-get update
123-
apt-get -y install cmake
126+
apt-get -y install cmake=3.25.2-0kitware1ubuntu22.04.1 cmake-data=3.25.2-0kitware1ubuntu22.04.1
124127
125128
pip install conan
126129
127130
- name: Create package
128131
shell: bash
129132
run: |
130133
conan profile detect
131-
conan create . --build=missing -s compiler.cppstd=14
134+
conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14
132135
133136
build_linux_debian:
134137
if: github.repository_owner == 'viamrobotics'
@@ -166,6 +169,7 @@ jobs:
166169
apt-get update
167170
apt-get -y dist-upgrade
168171
DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \
172+
autoconf \
169173
build-essential \
170174
ca-certificates \
171175
cmake \
@@ -204,4 +208,4 @@ jobs:
204208
205209
pip install conan
206210
conan profile detect
207-
conan create . --build=missing -s compiler.cppstd=14
211+
conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14

conanfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def configure(self):
3939
# From some experiments it seems that the shared-ness of these packages
4040
# should match that of the SDK recipe. Failure to do so can cause linker
4141
# errors while compiling, or static initialization errors at runtime for modules.
42-
for lib in ["grpc", "protobuf"]:
42+
for lib in ["grpc", "protobuf", "abseil"]:
4343
self.options[lib].shared = True
4444

4545
def requirements(self):

0 commit comments

Comments
 (0)