diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2023-01-04 10:53:56 +0100 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2023-01-04 10:58:50 +0100 |
| commit | ce1ddba0778ac256215731f4b823bb01dd3f5b9f (patch) | |
| tree | 8da20eda79659d05836d1302122cfd72090750da | |
| parent | 9ae288305b16e4aee2d2ea1fcfb5968c924fa219 (diff) | |
| download | sigc++-ce1ddba0778ac256215731f4b823bb01dd3f5b9f.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/meson.build | 8 | ||||
| -rw-r--r-- | meson.build | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/MSVC_NMake/meson.build b/MSVC_NMake/meson.build index 09078b3..f11412a 100644 --- a/MSVC_NMake/meson.build +++ b/MSVC_NMake/meson.build @@ -1,6 +1,6 @@ # MSVC_NMake -# Input: pkg_conf_data, sigcxxconfig_h, project_build_root, python3, +# Input: pkg_conf_data, sigcxxconfig_h_meson, project_build_root, python3, # can_add_dist_script # Output: sigc_rc @@ -10,11 +10,11 @@ sigc_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: sigcxxconfig_h, + input: sigcxxconfig_h_meson, output: 'sigc++config.h', - copy: true, + configuration: pkg_conf_data, ) untracked_msvc_nmake = 'untracked' / 'MSVC_NMake' diff --git a/meson.build b/meson.build index dc06c96..24b276e 100644 --- a/meson.build +++ b/meson.build @@ -245,9 +245,10 @@ configure_file( configuration: pkg_conf_data, ) +sigcxxconfig_h_meson = files('sigc++config.h.meson') install_includeconfigdir = install_libdir / sigcxx_pcname / 'include' -sigcxxconfig_h = configure_file( - input: 'sigc++config.h.meson', +configure_file( + input: sigcxxconfig_h_meson, output: 'sigc++config.h', configuration: pkg_conf_data, install_dir: install_includeconfigdir, |