From f740338520a691bb962a2e8d21b28a7f0a086ce1 Mon Sep 17 00:00:00 2001 From: Kjell Ahlstedt Date: Wed, 4 Jan 2023 14:39:23 +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/giomm/meson.build | 8 ++++---- MSVC_NMake/glibmm/meson.build | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'MSVC_NMake') diff --git a/MSVC_NMake/giomm/meson.build b/MSVC_NMake/giomm/meson.build index 658147df..3bc83150 100644 --- a/MSVC_NMake/giomm/meson.build +++ b/MSVC_NMake/giomm/meson.build @@ -1,6 +1,6 @@ # MSVC_NMake/giomm -# Input: pkg_conf_data, giommconfig_h +# Input: pkg_conf_data, giommconfig_h_meson # Output: giomm_rc giomm_rc = configure_file( @@ -9,9 +9,9 @@ giomm_rc = configure_file( configuration: pkg_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: giommconfig_h, + input: giommconfig_h_meson, output: 'giommconfig.h', - copy: true, + configuration: pkg_conf_data, ) diff --git a/MSVC_NMake/glibmm/meson.build b/MSVC_NMake/glibmm/meson.build index 5112281c..caf9fa0f 100644 --- a/MSVC_NMake/glibmm/meson.build +++ b/MSVC_NMake/glibmm/meson.build @@ -1,6 +1,6 @@ # MSVC_NMake/glibmm -# Input: pkg_conf_data, glibmmconfig_h +# Input: pkg_conf_data, glibmm_config_conf_data, glibmmconfig_h_meson # Output: glibmm_rc glibmm_rc = configure_file( @@ -9,9 +9,9 @@ glibmm_rc = configure_file( configuration: pkg_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: glibmmconfig_h, + input: glibmmconfig_h_meson, output: 'glibmmconfig.h', - copy: true, + configuration: glibmm_config_conf_data, ) -- cgit v1.2.1