ref: d2f6805c3f36718a742c33c56eb945c2e10646ef
parent: 841d57b82a516ccc6e90d1d4aee8d4a7f0d00010
author: Xavier Claessens <xavier.claessens@collabora.com>
date: Thu Nov 26 04:05:48 EST 2020
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>
--- 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()
--- a/meson.build
+++ b/meson.build
@@ -11,6 +11,8 @@
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')