From d2f6805c3f36718a742c33c56eb945c2e10646ef Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 26 Nov 2020 09:05:48 -0500 Subject: 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 --- meson.build | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 45fff3f2..41f69353 100644 --- a/meson.build +++ b/meson.build @@ -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') -- cgit v1.2.3