AnotherFoxGuy/webrtc-audio-processing
1
0
Fork 0
Code Pull Requests Activity

build: Use cmake to look up abseil dependency

Browse Source 
This should be much more robust than looking up the library directly.

Fixes: https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/issues/4
This commit is contained in:
Arun Raghavan 2020-12-10 19:06:31 -05:00
parent ce1a78887a
commit 3f9907f93d
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci.yml
View File

@ -19,7 +19,7 @@ variables:
# CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES. # CI runs, for example when adding new packages to FDO_DISTRIBUTION_PACKAGES.
# The tag is an arbitrary string that identifies the exact container # The tag is an arbitrary string that identifies the exact container
# contents. # contents.
BASE_TAG: '2020-11-27.1' BASE_TAG: '2020-12-10.1'
FDO_DISTRIBUTION_VERSION: '20.10' FDO_DISTRIBUTION_VERSION: '20.10'
FDO_UPSTREAM_REPO: 'pulseaudio/webrtc-audio-processing' FDO_UPSTREAM_REPO: 'pulseaudio/webrtc-audio-processing'
@ -43,6 +43,7 @@ include:
FDO_DISTRIBUTION_PACKAGES: >- FDO_DISTRIBUTION_PACKAGES: >-
g++ g++
gcc gcc
cmake
libabsl-dev libabsl-dev
meson meson
ninja-build ninja-build

21
meson.build
View File

@ -40,19 +40,14 @@ os_deps = []
have_posix = false have_posix = false
have_win = false have_win = false
absl_dep = [ absl_dep = dependency('absl', method : 'cmake',
cpp.find_library('absl_base'), modules : [
cpp.find_library('absl_bad_optional_access'), 'absl::base',
cpp.find_library('absl_flags_internal'), 'absl::flags_parse',
cpp.find_library('absl_flags_marshalling'), 'absl::strings',
cpp.find_library('absl_flags_parse'), 'absl::synchronization',
cpp.find_library('absl_flags_registry'), ]
cpp.find_library('absl_flags_usage_internal'), )
cpp.find_library('absl_raw_logging_internal'),
cpp.find_library('absl_strings'),
cpp.find_library('absl_synchronization'),
cpp.find_library('absl_throw_delegate'),
]
if ['darwin', 'ios'].contains(host_system) if ['darwin', 'ios'].contains(host_system)
os_cflags = ['-DWEBRTC_MAC'] os_cflags = ['-DWEBRTC_MAC']