diff options
author | Igor V. Kovalenko <igor.v.kovalenko@gmail.com> | 2021-11-05 01:52:38 +0300 |
---|---|---|
committer | PulseAudio Marge Bot <pulseaudio-maintainers@lists.freedesktop.org> | 2021-11-17 16:06:23 +0000 |
commit | 5fcc70e2e84146cfa585a980a6a572a7ebcd9825 (patch) | |
tree | 6b22a0eee8dff0b86c16177a95169e824618ad90 /meson.build | |
parent | 5f43173209e99567e1427e0d9db05ae3ac28cfbe (diff) |
build-sys: meson: Fix indentation in daemon/client blocks
Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/659>
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/meson.build b/meson.build index 827dfe13f..5f51f3a30 100644 --- a/meson.build +++ b/meson.build @@ -848,69 +848,69 @@ configure_file(output : 'config.h', configuration : cdata) if get_option('client') -# pkg-config files - -pc_cdata = configuration_data() - -pc_cdata.set('prefix', prefix) -pc_cdata.set('exec_prefix', prefix) -pc_cdata.set('libdir', libdir) -pc_cdata.set('includedir', includedir) -pc_cdata.set('modlibexecdir', modlibexecdir) -pc_cdata.set('PACKAGE_VERSION', pa_version_str) -pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor) -# FIXME: the line below is wrong. Currently the meson thread dep lacks documentation, -# and doesn't allow introspection, ie. none of get_pkgconfig_variable() or -# get_configtool_variable() work with it, so we have no way to get this flag right, -# unless we do all the work ourselves. See current work in glib, also meson #553. -pc_cdata.set('PTHREAD_LIBS', '-pthread') - -pc_files = [ - 'libpulse.pc', - 'libpulse-simple.pc', -] + # pkg-config files + + pc_cdata = configuration_data() + + pc_cdata.set('prefix', prefix) + pc_cdata.set('exec_prefix', prefix) + pc_cdata.set('libdir', libdir) + pc_cdata.set('includedir', includedir) + pc_cdata.set('modlibexecdir', modlibexecdir) + pc_cdata.set('PACKAGE_VERSION', pa_version_str) + pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor) + # FIXME: the line below is wrong. Currently the meson thread dep lacks documentation, + # and doesn't allow introspection, ie. none of get_pkgconfig_variable() or + # get_configtool_variable() work with it, so we have no way to get this flag right, + # unless we do all the work ourselves. See current work in glib, also meson #553. + pc_cdata.set('PTHREAD_LIBS', '-pthread') + + pc_files = [ + 'libpulse.pc', + 'libpulse-simple.pc', + ] -if glib_dep.found() - pc_files += 'libpulse-mainloop-glib.pc' -endif + if glib_dep.found() + pc_files += 'libpulse-mainloop-glib.pc' + endif -foreach file : pc_files - configure_file( - input : file + '.in', - output : file, - configuration : pc_cdata, - install_dir : pkgconfigdir) -endforeach + foreach file : pc_files + configure_file( + input : file + '.in', + output : file, + configuration : pc_cdata, + install_dir : pkgconfigdir) + endforeach -# CMake files + # CMake files -m4 = find_program('m4', required: true) + m4 = find_program('m4', required: true) -cmakedir = join_paths(libdir, 'cmake', 'PulseAudio') + cmakedir = join_paths(libdir, 'cmake', 'PulseAudio') -cmake_template_file = configure_file( - input : 'PulseAudioConfig.cmake.in', - output : 'PulseAudioConfig.cmake.tmp', - configuration: cdata, -) + cmake_template_file = configure_file( + input : 'PulseAudioConfig.cmake.in', + output : 'PulseAudioConfig.cmake.tmp', + configuration: cdata, + ) -custom_target('PulseAudioConfig.cmake', - input : cmake_template_file, - output : 'PulseAudioConfig.cmake', - capture : true, - command : [m4, '@INPUT@'], - build_by_default : true, - install : true, - install_dir : cmakedir, -) + custom_target('PulseAudioConfig.cmake', + input : cmake_template_file, + output : 'PulseAudioConfig.cmake', + capture : true, + command : [m4, '@INPUT@'], + build_by_default : true, + install : true, + install_dir : cmakedir, + ) -configure_file( - input : 'PulseAudioConfigVersion.cmake.in', - output : 'PulseAudioConfigVersion.cmake', - configuration: cdata, - install : true, - install_dir : cmakedir, -) + configure_file( + input : 'PulseAudioConfigVersion.cmake.in', + output : 'PulseAudioConfigVersion.cmake', + configuration: cdata, + install : true, + install_dir : cmakedir, + ) endif # client |