diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2023-01-04 13:11:12 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2023-01-04 13:11:12 +0100 |
| commit | 7fe453eefbd11ac0e1f02b08e957c53fae469a5d (patch) | |
| tree | 1e490f9391c389a69143676d78fcab34dc2a5889 | |
| parent | b3d875df0fcd650e268f998e8596a6114bc72c20 (diff) | |
Meson build: Don't copy files with configure_file()
It's deprecated from Meson 0.64. The replacement, fs.copyfile(),
is not useful here. It only copies from the source directory to
the build directory.
| -rw-r--r-- | MSVC_NMake/cairomm/meson.build | 8 | ||||
| -rw-r--r-- | meson.build | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/MSVC_NMake/cairomm/meson.build b/MSVC_NMake/cairomm/meson.build index f39be54..5c497cb 100644 --- a/MSVC_NMake/cairomm/meson.build +++ b/MSVC_NMake/cairomm/meson.build @@ -1,6 +1,6 @@ # MSVC_NMake/cairomm -# Input: mm_conf_data, cairommconfig_h +# Input: mm_conf_data, cairommconfig_h_meson # Output: cairomm_rc cairomm_rc = configure_file( @@ -9,9 +9,9 @@ cairomm_rc = configure_file( configuration: mm_conf_data, ) -# Copy the generated configuration header into the MSVC project directory. +# Make a copy of the generated configuration header in the MSVC project directory. configure_file( - input: cairommconfig_h, + input: cairommconfig_h_meson, output: 'cairommconfig.h', - copy: true, + configuration: mm_conf_data, ) diff --git a/meson.build b/meson.build index a9e7036..6f727b0 100644 --- a/meson.build +++ b/meson.build @@ -296,9 +296,10 @@ mm_conf_data.set('CAIROMM_MINOR_VERSION', cairomm_minor_version) mm_conf_data.set('CAIROMM_MICRO_VERSION', cairomm_micro_version) mm_conf_data.set('VERSION', meson.project_version()) # for MSVC_NMake/cairomm/cairomm.rc +cairommconfig_h_meson = files('cairommconfig.h.meson') install_includeconfigdir = install_libdir / cairomm_pcname / 'include' -cairommconfig_h = configure_file( - input: 'cairommconfig.h.meson', +configure_file( + input: cairommconfig_h_meson, output: 'cairommconfig.h', configuration: mm_conf_data, install_dir: install_includeconfigdir, |