Meson: Fix warnings introduced in 0.47.0

This commit is contained in:
Xavier Claessens 2018-07-03 10:47:52 -04:00
parent 543a9c4f33
commit 95fa229f34
2 changed files with 2 additions and 3 deletions

View File

@ -30,12 +30,11 @@ gdbus_codegen_built_files += configure_file(input : 'config.py.in',
install_dir : codegen_dir,
configuration : gdbus_codegen_conf)
blank_conf = configuration_data()
foreach f : gdbus_codegen_files
# Copy these into the builddir so that gdbus-codegen can be used uninstalled
# and then install it too so that it can be used after installation
gdbus_codegen_built_files += configure_file(input : f, output : f,
install : true,
install_dir : codegen_dir,
configuration : blank_conf)
copy : true)
endforeach

View File

@ -425,7 +425,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
# referenced by test.gresource.xml
test_generated_txt = configure_file(input : 'test1.txt',
output : 'test-generated.txt',
configuration : configuration_data(),
copy : true,
install : false)
exe = executable('resources', 'resources.c', test_gresource,