Verified Commit d2f6805c authored by Xavier Claessens's avatar Xavier Claessens Committed by Ralph Giles
Browse files

Meson: Fix doc build when opus is a subproject



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's avatarRalph Giles <giles@thaumas.net>
parent 841d57b8
Pipeline #2284 passed with stage
in 5 minutes and 18 seconds
top_srcdir = meson.source_root()
top_builddir = meson.build_root()
have_dot = find_program('dot', required: false).found()
doxyfile_conf = configuration_data()
......
......@@ -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')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment