Skip to content

Commit 7324baf

Browse files
move system libs from profiles to separate files
some users may want not to use them
1 parent e638a6b commit 7324baf

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

.github/workflows/rebuildDependencies.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,35 @@ jobs:
1616
os: macos-14
1717
before_install: macos.sh
1818
conan_profile: macos-intel
19+
conan_options: --profile=../conan_profiles/base/apple-system
1920
conan_system_libs: bzip2 libiconv sqlite3 zlib
2021
- platform: mac-arm
2122
os: macos-14
2223
before_install: macos.sh
2324
conan_profile: macos-arm
25+
conan_options: --profile=../conan_profiles/base/apple-system
2426
conan_system_libs: bzip2 libiconv sqlite3 zlib
2527
- platform: ios
2628
os: macos-14
2729
before_install: macos.sh
2830
conan_profile: ios-arm64
31+
conan_options: --profile=../conan_profiles/base/apple-system
2932
conan_system_libs: bzip2 libiconv sqlite3 zlib
3033
- platform: android-armeabi-v7a
3134
os: ubuntu-latest
3235
before_install: android-32.sh
3336
conan_profile: android-32-ndk
37+
conan_options: --profile=../conan_profiles/base/android-system
3438
conan_system_libs: zlib
3539
- platform: android-arm64-v8a
3640
os: ubuntu-latest
3741
conan_profile: android-64-ndk
42+
conan_options: --profile=../conan_profiles/base/android-system
3843
conan_system_libs: zlib
3944
- platform: android-x64
4045
os: ubuntu-latest
4146
conan_profile: android-x64-ndk
47+
conan_options: --profile=../conan_profiles/base/android-system
4248
conan_system_libs: zlib
4349
- platform: windows-x64
4450
os: windows-latest
@@ -151,6 +157,7 @@ jobs:
151157
PATH="$WINDOWS_PERL_DIR:$PATH" conan create $packagePath \
152158
--version=$version \
153159
--profile=../conan_profiles/${{ matrix.conan_profile }} \
160+
${{ matrix.conan_options }} \
154161
--build=missing \
155162
--test-folder= \
156163
--core-conf core.sources.patch:extra_path=$CUSTOM_PATCHES_PATH \
@@ -186,6 +193,7 @@ jobs:
186193
conan create "recipes/$package/all" \
187194
--version=$version \
188195
--profile=../conan_profiles/${{ matrix.conan_profile }} \
196+
${{ matrix.conan_options }} \
189197
--build=missing \
190198
--test-folder=
191199
done

conan_profiles/base/android-system

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[replace_requires]
2+
zlib/*: zlib/[*]@system

conan_profiles/base/apple-system

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[replace_requires]
2+
bzip2/*: bzip2/[*]@system
3+
libiconv/*: libiconv/[*]@system
4+
sqlite3/*: sqlite3/[*]@system
5+
zlib/*: zlib/[*]@system

0 commit comments

Comments
 (0)