Skip to content

Commit ce1ddba

Browse files
committed
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.
1 parent 9ae2883 commit ce1ddba

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

MSVC_NMake/meson.build

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

3-
# Input: pkg_conf_data, sigcxxconfig_h, project_build_root, python3,
3+
# Input: pkg_conf_data, sigcxxconfig_h_meson, project_build_root, python3,
44
# can_add_dist_script
55
# Output: sigc_rc
66

@@ -10,11 +10,11 @@ sigc_rc = configure_file(
1010
configuration: pkg_conf_data,
1111
)
1212

13-
# Copy the generated configuration header into the MSVC project directory.
13+
# Make a copy of the generated configuration header in the MSVC project directory.
1414
configure_file(
15-
input: sigcxxconfig_h,
15+
input: sigcxxconfig_h_meson,
1616
output: 'sigc++config.h',
17-
copy: true,
17+
configuration: pkg_conf_data,
1818
)
1919

2020
untracked_msvc_nmake = 'untracked' / 'MSVC_NMake'

meson.build

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,10 @@ configure_file(
245245
configuration: pkg_conf_data,
246246
)
247247

248+
sigcxxconfig_h_meson = files('sigc++config.h.meson')
248249
install_includeconfigdir = install_libdir / sigcxx_pcname / 'include'
249-
sigcxxconfig_h = configure_file(
250-
input: 'sigc++config.h.meson',
250+
configure_file(
251+
input: sigcxxconfig_h_meson,
251252
output: 'sigc++config.h',
252253
configuration: pkg_conf_data,
253254
install_dir: install_includeconfigdir,

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy