diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-11-26 17:05:48 +0300 |
---|---|---|
committer | Ralph Giles <giles@thaumas.net> | 2020-11-26 22:20:44 +0300 |
commit | d2f6805c3f36718a742c33c56eb945c2e10646ef (patch) | |
tree | 3eb14cb0d058ab8ab042f13e7f2dc0529c3c204f | |
parent | 841d57b82a516ccc6e90d1d4aee8d4a7f0d00010 (diff) |
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 <giles@thaumas.net>
-rw-r--r-- | doc/meson.build | 3 | ||||
-rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/meson.build b/doc/meson.build index 8f967a51..ee42a2b0 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -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() 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') |