From 5ca7bf6e9862c8106219aaadd72cf4097a3d2a5e Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Wed, 4 Jan 2023 13:11:12 +0100 Subject: 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. --- MSVC_NMake/cairomm/meson.build | 8 ++++---- 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 65b3ca2..8f7950d 100644 --- a/meson.build +++ b/meson.build @@ -293,9 +293,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, -- cgit v1.2.3