eden-emu/opus
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Meson: Fix doc build when opus is a subproject

Browse source 
meson.source_root() and meson.build_root() have been deprecated in
latest Meson release because they are a trap. They point to the root of
parent project instead of root of current subproject. Meson 0.56.0 added
meson.project_source/build_root() but it is just as easy to use
meson.current_source/build_dir() in the root meson.build file and avoids
bumping required meson version.

Signed-off-by: Ralph Giles <giles@thaumas.net>
This commit is contained in:
Xavier Claessens 2020-11-26 09:05:48 -05:00 • committed by Ralph Giles
parent 841d57b82a
commit d2f6805c3f
No known key found for this signature in database
GPG key ID: 9259A8F2D2D44C84
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/meson.build
View file

@ -1,6 +1,3 @@
top_srcdir = meson.source_root()
top_builddir = meson.build_root()
have_dot = find_program('dot', required: false).found()
doxyfile_conf = configuration_data()

2
meson.build
View file

@ -11,6 +11,8 @@ macosversion = run_command('meson/get-version.py', '--darwin-version', check: tr
cc = meson.get_compiler('c')
host_system = host_machine.system()
host_cpu_family = host_machine.cpu_family()
top_srcdir = meson.current_source_dir()
top_builddir = meson.current_build_dir()
opus_includes = include_directories('.', 'include', 'celt', 'silk')
opus_public_includes = include_directories('include')