diff options
| author | Yegor Yefremov <yegorslists@googlemail.com> | 2024-01-11 13:06:33 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2024-01-15 09:40:40 +0000 |
| commit | 7c23c3db2ff778121ba8214ac0f2d8d2c9b465d5 (patch) | |
| tree | dda58857dd790cdbe507b1ef621a41b56ccc8abc | |
| parent | 19b3e59151db7a3823bc479c5cddf7269bbca595 (diff) | |
build: resolve deprecated 'copy' key argument in configure_file warning
Resolves the following warning:
NOTICE: Future-deprecated features used:
* 0.64.0: {'copy arg in configure_file'}
copy arg was deprecated in meson version 0.64. Hence, use
fs.copyfile() that is also introduced in 0.64, in versions
since 0.64 and use the old approach for older versions.
| -rw-r--r-- | data/meson.build | 21 | ||||
| -rw-r--r-- | meson.build | 5 |
2 files changed, 20 insertions, 6 deletions
diff --git a/data/meson.build b/data/meson.build index 7063d00e..1d0c9aeb 100644 --- a/data/meson.build +++ b/data/meson.build @@ -11,12 +11,21 @@ service_conf = { } # DBus Service file -configure_file( - input: 'org.freedesktop.ModemManager1.conf.@0@polkit'.format(enable_polkit ? '' : 'no'), - output: '@BASENAME@', - copy: true, - install_dir: dbus_policy_dir, -) +if meson_version.version_compare('>=0.64') + fs.copyfile( + 'org.freedesktop.ModemManager1.conf.@0@polkit'.format(enable_polkit ? '' : 'no'), + '@BASENAME@', + install: true, + install_dir: dbus_policy_dir, + ) +else + configure_file( + input: 'org.freedesktop.ModemManager1.conf.@0@polkit'.format(enable_polkit ? '' : 'no'), + output: '@BASENAME@', + copy: true, + install_dir: dbus_policy_dir, + ) +endif # DBus Activation file configure_file( diff --git a/meson.build b/meson.build index 503ff016..9f928bc6 100644 --- a/meson.build +++ b/meson.build @@ -13,6 +13,11 @@ project( meson_version: '>= 0.53.0', ) +meson_version = meson.version() +if meson_version.version_compare('>=0.64') + fs = import('fs') +endif + mm_name = meson.project_name() mm_version = meson.project_version() version_array = mm_version.split('.') |