[libgda] Meson: Fix warnings



commit 3bb1c295aedc57bf047b586ea70ae8bb8cda6019
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Apr 5 08:59:19 2019 -0600

    Meson: Fix warnings

 libgda/meson.build |  5 +++--
 meson.build        | 22 ++++++++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/libgda/meson.build b/libgda/meson.build
index 0dc9e6301..2ba015703 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -394,8 +394,9 @@ libgda_gir = gnome_module.generate_gir(libgda,
        libgda_vala_deps = configure_file(
                input: 'libgda.deps.in',
                output: 'libgda-'+project_api_version+'.deps',
-               configuration: tconf,
-               install: true,
+               copy: true
+               )
+       install_data(libgda_vala_deps,
                install_dir: join_paths(get_option('datadir'),'vala','vapi')
                )
        libgda_vapi = custom_target(project_package,
diff --git a/meson.build b/meson.build
index 5578efd17..aaea93a9d 100644
--- a/meson.build
+++ b/meson.build
@@ -110,7 +110,6 @@ sqlite_dep = dependency ('sqlite3', version: '>= 3.22.0', required: false)
 sqlite_internal = true
 if sqlite_dep.found()
        sqlite3_table_column_metadata = compiler.has_function('sqlite3_table_column_metadata',
-                                                               required: true,
                                                                dependencies: sqlite_dep)
 endif
 
@@ -118,7 +117,6 @@ endif
 sqlcipher_dep = dependency ('sqlcipher', version: '>= 3.4', required: false)
 if sqlcipher_dep.found() and not get_option('disable-sqlcipher')
        sqlcipher_table_column_metadata = compiler.has_function('sqlite3_table_column_metadata',
-                                                               required: true,
                                                                dependencies: sqlcipher_dep)
 endif
 
@@ -367,8 +365,9 @@ endif
 libgda_pc = configure_file(
        input: 'libgda-'+project_api_version+'.pc.in',
        output: 'libgda-'+project_api_version+'.pc',
-       configuration: conf,
-       install: true,
+       configuration: conf
+       )
+install_data(libgda_pc,
        install_dir: join_paths(get_option('libdir'),'pkgconfig')
        )
 
@@ -376,8 +375,9 @@ if libxslt_dep.found()
        libgda_xslt_pc = configure_file(
                input: 'libgda-xslt-'+project_api_version+'.pc.in',
                output: 'libgda-xslt-'+project_api_version+'.pc',
-               configuration: conf,
-               install: true,
+               configuration: conf
+               )
+       install_data(libgda_xslt_pc,
                install_dir: join_paths(get_option('libdir'),'pkgconfig')
                )
 endif
@@ -386,15 +386,17 @@ if enable_ui
 libgdaui_pc = configure_file(
        input: 'libgda-ui-'+project_api_version+'.pc.in',
        output: 'libgda-ui-'+project_api_version+'.pc',
-       configuration: conf,
-       install: true,
+       configuration: conf
+       )
+install_data(libgdaui_pc,
        install_dir: join_paths(get_option('libdir'),'pkgconfig')
        )
 libgda_report_pc = configure_file(
        input: 'libgda-report-'+project_api_version+'.pc.in',
        output: 'libgda-report-'+project_api_version+'.pc',
-       configuration: conf,
-       install: true,
+       configuration: conf
+       )
+install_data(libgda_report_pc,
        install_dir: join_paths(get_option('libdir'),'pkgconfig')
        )
 endif


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