games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-17 11:56:46 +02:00
Code Issues Releases Activity

[Conan] add option to use Apple system libraries as overrides

Browse Source
This commit is contained in:
Andrey Filipenkov 2022-10-18 10:07:47 +03:00
parent 1e8be46ced
commit cf34c8da56
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/github.yml vendored
View File

@ -136,7 +136,8 @@ jobs:
--no-imports \ --no-imports \
--build=never \ --build=never \
--profile:build=default \ --profile:build=default \
--profile:host=CI/conan/${{ matrix.conan_profile }} --profile:host=CI/conan/${{ matrix.conan_profile }} \
--options with_apple_system_libs=True
- name: Git branch name - name: Git branch name
id: git-branch-name id: git-branch-name

4
conanfile.py
View File

@ -22,11 +22,13 @@ class VCMI(ConanFile):
] ]
options = { options = {
"default_options_of_requirements": [True, False], "default_options_of_requirements": [True, False],
"with_apple_system_libs": [True, False],
"with_ffmpeg": [True, False], "with_ffmpeg": [True, False],
"with_luajit": [True, False], "with_luajit": [True, False],
} }
default_options = { default_options = {
"default_options_of_requirements": False, "default_options_of_requirements": False,
"with_apple_system_libs": False,
"with_ffmpeg": True, "with_ffmpeg": True,
"with_luajit": False, "with_luajit": False,
@ -175,7 +177,7 @@ class VCMI(ConanFile):
self.requires("ffmpeg/[^4.4]") self.requires("ffmpeg/[^4.4]")
# use Apple system libraries instead of external ones # use Apple system libraries instead of external ones
if not self.options.default_options_of_requirements and is_apple_os(self): if self.options.with_apple_system_libs and not self.options.default_options_of_requirements and is_apple_os(self):
systemLibsOverrides = [ systemLibsOverrides = [
"bzip2/1.0.8", "bzip2/1.0.8",
"libiconv/1.17", "libiconv/1.17",