[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] meson: fix meson warnings

[PulseAudio Marge Bot (@pulseaudio-merge-bot)]

PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio


Commits:
ff6010b8 by Rosen Penev at 2022-08-01T19:08:41+00:00
meson: fix meson warnings

Signed-off-by: Rosen Penev <rosenp at gmail.com>
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/739>

- - - - -


1 changed file:

- meson.build


Changes:

=====================================
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



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ff6010b80f1cf8ebeabaea8b8fc3fc53aa2bd7a1

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/commit/ff6010b80f1cf8ebeabaea8b8fc3fc53aa2bd7a1
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20220801/aa4a4249/attachment.htm>