Skip to content

Commit 00cd264

Browse files
committed
Meson build: Don't copy files with configure_file()
It's deprecated since Meson 0.64. The replacement, fs.copyfile(), is not useful here. It only copies from the source directory to the build directory.
1 parent e5900c4 commit 00cd264

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

MSVC_NMake/libxml++/meson.build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MSVC_NMake/libxml++
22

3-
# Input: pkg_conf_data, xmlxxconfig_h
3+
# Input: pkg_conf_data, xmlxxconfig_h_meson
44
# Output: xmlxx_rc
55

66
xmlxx_rc = configure_file(
@@ -9,9 +9,9 @@ xmlxx_rc = configure_file(
99
configuration: pkg_conf_data,
1010
)
1111

12-
# Copy the generated configuration header into the MSVC project directory.
12+
# Make a copy of the generated configuration header in the MSVC project directory.
1313
configure_file(
14-
input: xmlxxconfig_h,
14+
input: xmlxxconfig_h_meson,
1515
output: 'libxml++config.h',
16-
copy: true,
16+
configuration: pkg_conf_data,
1717
)

meson.build

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,10 @@ configure_file(
393393
install_dir: install_pkgconfigdir,
394394
)
395395

396+
xmlxxconfig_h_meson = files('libxml++config.h.meson')
396397
install_includeconfigdir = install_libdir / xmlxx_pcname / 'include'
397-
xmlxxconfig_h = configure_file(
398-
input: 'libxml++config.h.meson',
398+
configure_file(
399+
input: xmlxxconfig_h_meson,
399400
output: 'libxml++config.h',
400401
configuration: pkg_conf_data,
401402
install_dir: install_includeconfigdir,

0 commit comments

Comments
 (0)