[glib: 3/6] Meson: Fix warnings introduced in 0.47.0



commit 95fa229f34f8efdbe44091d1f3f9a87c3139bd52
Author: Xavier Claessens <xavier claessens collabora com>
Date:   Tue Jul 3 10:47:52 2018 -0400

    Meson: Fix warnings introduced in 0.47.0

 gio/gdbus-2.0/codegen/meson.build | 3 +--
 gio/tests/meson.build             | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build
index 54a86b0d6..af1bc9fb2 100644
--- a/gio/gdbus-2.0/codegen/meson.build
+++ b/gio/gdbus-2.0/codegen/meson.build
@@ -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
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index be007fa1d..b3edc7c82 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -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,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]