diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-25 17:23:08 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-09-29 17:55:39 +0200 |
| commit | eb937365faeeddc94a0144bc1565b223ee87351f (patch) | |
| tree | 74c4b6e45c9527f821e55c8cce1448a59c8d5819 | |
| parent | b09c8f7a99681054af1bcbb88f374c181af91972 (diff) | |
meson.build: Move SPHINX_ARGS to top level meson.build file
We're going to want to use SPHINX_ARGS in both docs/meson.build
and tests/qapi-schema/meson.build. Move the definition up to the
top level file so it is available to both subdirectories.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200925162316.21205-14-peter.maydell@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | docs/meson.build | 8 | ||||
| -rw-r--r-- | meson.build | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/docs/meson.build b/docs/meson.build index 663bdb9073..52e384be17 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,11 +1,3 @@ -SPHINX_ARGS = [config_host['SPHINX_BUILD'], - '-Dversion=' + meson.project_version(), - '-Drelease=' + config_host['PKGVERSION']] - -if get_option('werror') - SPHINX_ARGS += [ '-W' ] -endif - if build_docs configure_file(output: 'index.html', input: files('index.html.in'), diff --git a/meson.build b/meson.build index 7eb2c9c01a..866321462e 100644 --- a/meson.build +++ b/meson.build @@ -672,6 +672,14 @@ foreach d : hx_headers endforeach genh += hxdep +SPHINX_ARGS = [config_host['SPHINX_BUILD'], + '-Dversion=' + meson.project_version(), + '-Drelease=' + config_host['PKGVERSION']] + +if get_option('werror') + SPHINX_ARGS += [ '-W' ] +endif + # Collect sourcesets. util_ss = ss.source_set() |