diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2022-11-04 23:41:10 -0500 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2022-11-04 23:41:10 -0500 |
| commit | 3d9936baff019f83fd2d893cd67fa2fb5a649e75 (patch) | |
| tree | 70663a982dc31c38c5e1e1a8560f5be704bd74cd /finch | |
| parent | a8c72117c69d2d6083dd346a3488b9edf7620729 (diff) | |
| download | pidgin-3d9936baff019f83fd2d893cd67fa2fb5a649e75.tar.gz | |
Take advantage of f-strings in Meson
They were added in 0.58, which is our minimum version
https://mesonbuild.com/Syntax.html#format-strings
Testing Done:
Reconfigured, ran tests, and checked a few generated files to be sure they looked okay.
Reviewed at https://reviews.imfreedom.org/r/2033/
Diffstat (limited to 'finch')
| -rw-r--r-- | finch/meson.build | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/finch/meson.build b/finch/meson.build index 56d5af6ab6..76548e11dc 100644 --- a/finch/meson.build +++ b/finch/meson.build @@ -73,7 +73,7 @@ if not ncurses_available error('ncurses could not be found!') endif -ncurses_header = '-DNCURSES_HEADER="@0@"'.format(ncurses_header) +ncurses_header = f'-DNCURSES_HEADER="@ncurses_header@"' enable_consoleui = true @@ -157,7 +157,7 @@ libfinch_built_headers += libfinch_enums[1] FINCH_H_INCLUDES = [] foreach header : libfinch_headers + ['finchenums.h'] - FINCH_H_INCLUDES += '#include <finch/@0@>'.format(header) + FINCH_H_INCLUDES += f'#include <finch/@header@>' endforeach finch_h_conf = configuration_data() finch_h_conf.set('FINCH_H_INCLUDES', '\n'.join(FINCH_H_INCLUDES)) @@ -198,8 +198,7 @@ if enable_introspection symbol_prefix : 'finch', identifier_prefix : 'Finch', export_packages : 'finch-3', - nsversion : '@0@.@1@'.format(purple_major_version, - purple_minor_version), + nsversion : f'@purple_major_version@.@purple_minor_version@', dependencies: [libgnt_dep, gplugin_dep, libpurple_dep], install : true, extra_args : ['-DFINCH_COMPILATION', '--quiet']) @@ -234,6 +233,6 @@ pkgconfig.generate( subdirs : 'finch-3', # NOTE: Don't use gnt from pkgconfig, as it might be a subproject. requires : ['gnt', libpurple], - variables : ['plugindir=${libdir}/finch-@0@'.format(purple_major_version)]) + variables : [f'plugindir=${libdir}/finch-@purple_major_version@']) subdir('plugins') |