Skip to content

Commit 5641ce7

Browse files
committed
ci+conan: Detect default and add cppstd17 profiles.
1 parent dc28693 commit 5641ce7

4 files changed

Lines changed: 4 additions & 11 deletions

File tree

ci/cibuildwheel_linux_before_all.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ pip install 'conan>=2' 'cmake>=3.23' ninja
99
yum install -y perl-IPC-Cmd perl-Digest-SHA
1010

1111
# Install Conan configuration.
12+
conan profile detect
1213
conan config install "$PACKAGE/ci/conan"
1314

1415
# Clone and export libqi to Conan cache.
@@ -27,4 +28,4 @@ conan export /work/libqi --version="${QI_VERSION}"
2728
# This is because the GLIBC from the manylinux images are often older than the
2829
# ones that were used to build the precompiled binaries, which means the binaries
2930
# cannot by executed.
30-
conan install "$PACKAGE" --build="*"
31+
conan install "$PACKAGE" --build="*" --profile:all default --profile:all cppstd17

ci/conan/global.conf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
core:default_profile=default
2-
core:default_build_profile=default
31
tools.build:skip_test=true
42
tools.cmake.cmaketoolchain:generator=Ninja
53
# Only use the build_type as a variable for the build folder name, so

ci/conan/profiles/cppstd17

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[settings]
2+
compiler.cppstd=gnu17

ci/conan/profiles/default

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)