summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2023-01-04 14:39:23 +0100
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2023-01-04 14:39:23 +0100
commitf740338520a691bb962a2e8d21b28a7f0a086ce1 (patch)
tree1f4d233228093855e6a8e7fc3b19d09066765bad /glib
parentf674418a4564294b5bb77e3c9a72b31ab28122b4 (diff)
downloadglibmm-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.
Diffstat (limited to 'glib')
-rw-r--r--glib/meson.build8
1 files changed, 5 insertions, 3 deletions
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,