summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2022-07-26 19:22:09 -0700
committerPulseAudio Marge Bot <pulseaudio-maintainers@lists.freedesktop.org>2022-08-01 19:08:41 +0000
commitff6010b80f1cf8ebeabaea8b8fc3fc53aa2bd7a1 (patch)
treede310fea2e1fdc0a4991aafc5b6999a67b2eee4b
parentffbcf368545f2b244f23dd67130c3eae40f6b6b1 (diff)
downloadpulseaudio-ff6010b80f1cf8ebeabaea8b8fc3fc53aa2bd7a1.tar.gz
meson: fix meson warnings
Signed-off-by: Rosen Penev <rosenp@gmail.com> Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/739>
-rw-r--r--meson.build6
1 files changed, 4 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index c5135330f..132f35c92 100644
--- a/meson.build
+++ b/meson.build
@@ -1,10 +1,12 @@
project('pulseaudio', 'c', 'cpp',
- version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(),
+ version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version'), check : false).stdout().strip(),
meson_version : '>= 0.50.0',
default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ]
)
-meson.add_dist_script('scripts/save-tarball-version.sh', meson.project_version())
+if not meson.is_subproject()
+ meson.add_dist_script('scripts/save-tarball-version.sh', meson.project_version())
+endif
pa_version_str = meson.project_version()
# For tarballs, the first split will do nothing, but for builds in git, we