mirror of
https://github.com/vcmi/vcmi.git
synced 2025-02-13 13:18:43 +02:00
[Conan] add option to use Apple system libraries as overrides
This commit is contained in:
parent
1e8be46ced
commit
cf34c8da56
3
.github/workflows/github.yml
vendored
3
.github/workflows/github.yml
vendored
@ -136,7 +136,8 @@ jobs:
|
||||
--no-imports \
|
||||
--build=never \
|
||||
--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
|
||||
id: git-branch-name
|
||||
|
@ -22,11 +22,13 @@ class VCMI(ConanFile):
|
||||
]
|
||||
options = {
|
||||
"default_options_of_requirements": [True, False],
|
||||
"with_apple_system_libs": [True, False],
|
||||
"with_ffmpeg": [True, False],
|
||||
"with_luajit": [True, False],
|
||||
}
|
||||
default_options = {
|
||||
"default_options_of_requirements": False,
|
||||
"with_apple_system_libs": False,
|
||||
"with_ffmpeg": True,
|
||||
"with_luajit": False,
|
||||
|
||||
@ -175,7 +177,7 @@ class VCMI(ConanFile):
|
||||
self.requires("ffmpeg/[^4.4]")
|
||||
|
||||
# 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 = [
|
||||
"bzip2/1.0.8",
|
||||
"libiconv/1.17",
|
||||
|
Loading…
x
Reference in New Issue
Block a user