diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2023-01-04 14:39:23 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2023-01-04 14:39:23 +0100 |
| commit | f740338520a691bb962a2e8d21b28a7f0a086ce1 (patch) | |
| tree | 1f4d233228093855e6a8e7fc3b19d09066765bad | |
| parent | f674418a4564294b5bb77e3c9a72b31ab28122b4 (diff) | |
| download | glibmm-f740338520a691bb962a2e8d21b28a7f0a086ce1.tar.gz | |
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/giomm/meson.build | 8 | ||||
| -rw-r--r-- | MSVC_NMake/glibmm/meson.build | 8 | ||||
| -rw-r--r-- | gio/meson.build | 5 | ||||
| -rw-r--r-- | glib/meson.build | 8 |
4 files changed, 16 insertions, 13 deletions
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, ) diff --git a/gio/meson.build b/gio/meson.build index 4213109f..096617f3 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -20,9 +20,10 @@ configure_file( configuration: giomm_pkg_uninst_conf_data, ) +giommconfig_h_meson = files('giommconfig.h.meson') install_giommconfigdir = install_libdir / giomm_pcname / 'include' -giommconfig_h = configure_file( - input: 'giommconfig.h.meson', +configure_file( + input: giommconfig_h_meson, output: 'giommconfig.h', configuration: pkg_conf_data, install_dir: install_giommconfigdir, diff --git a/glib/meson.build b/glib/meson.build index 0c20a912..d16621e9 100644 --- a/glib/meson.build +++ b/glib/meson.build @@ -5,7 +5,8 @@ # giomm_requires, build_deprecated_api, install_pkgconfigdir, # is_os_cocoa, cpp_compiler, glibmm_major_version, glibmm_minor_version, # glibmm_micro_version, msvc14x_toolset_ver -# Output: pkg_conf_data, install_glibmmconfigdir, glibmmconfig_h +# Output: pkg_conf_data, glibmm_config_conf_data, install_glibmmconfigdir, +# glibmmconfig_h_meson pkg_conf_data = configuration_data() pkg_conf_data.set('prefix', install_prefix) @@ -104,9 +105,10 @@ foreach conf_test : conf_tests endif endforeach +glibmmconfig_h_meson = files('glibmmconfig.h.meson') install_glibmmconfigdir = install_libdir / glibmm_pcname / 'include' -glibmmconfig_h = configure_file( - input: 'glibmmconfig.h.meson', +configure_file( + input: glibmmconfig_h_meson, output: 'glibmmconfig.h', configuration: glibmm_config_conf_data, install_dir: install_glibmmconfigdir, |