[libgda] Meson subproject: fix sqlite provider paths



commit 89af87f1484101bb505487d0ffd45e783b9daacd
Author: Daniel Espinosa <esodan gmail com>
Date:   Tue Apr 9 10:38:14 2019 -0500

    Meson subproject: fix sqlite provider paths

 providers/sqlite/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/providers/sqlite/meson.build b/providers/sqlite/meson.build
index 66fe545c5..c80bef175 100644
--- a/providers/sqlite/meson.build
+++ b/providers/sqlite/meson.build
@@ -23,7 +23,7 @@ endforeach
 sqlite_resourcesc = custom_target('sqlite_resourcesc',
        command: [compile_resources,
                '--sourcedir='+meson.current_build_dir(),
-               '--sourcedir='+join_paths(meson.source_root(),'providers','sqlite'),
+               '--sourcedir='+meson.current_source_dir(),
                '--generate-source',
                '--target', '@OUTPUT@',
                '--internal',
@@ -38,7 +38,7 @@ sqlite_resourcesc = custom_target('sqlite_resourcesc',
 sqlite_resourcesh = custom_target('sqlite_resourcesh',
        command: [compile_resources,
                '--sourcedir='+meson.current_build_dir(),
-               '--sourcedir='+join_paths(meson.source_root(),'providers','sqlite'),
+               '--sourcedir='+meson.current_source_dir(),
                '--generate-header',
                '--target', '@OUTPUT@',
                '--internal',
@@ -65,7 +65,7 @@ libgda_sqlite_providerpc = configure_file(output : 'libgda-sqlite-'+project_api_
 
 libgda_sqlite_provider_cargs = [
                '-include',
-               meson.build_root() + '/config.h',
+               'config.h',
                '-I'+join_paths(get_option ('prefix'), get_option('includedir'))
                ]
 libgda_sqlite_provider_cargs += c_args


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