[libgda] Vala: added deps file
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Vala: added deps file
- Date: Thu, 26 Jul 2018 22:44:50 +0000 (UTC)
commit 6c6bc803ac9faae6c8fd9139d7a5b4beffd1740d
Author: Daniel Espinosa <esodan gmail com>
Date: Thu Jul 26 13:31:36 2018 -0500
Vala: added deps file
libgda/libgda.deps.in | 2 ++
libgda/meson.build | 7 +++++++
providers/skel-implementation/models/meson.build | 23 ++++++++++++-----------
3 files changed, 21 insertions(+), 11 deletions(-)
---
diff --git a/libgda/libgda.deps.in b/libgda/libgda.deps.in
new file mode 100644
index 000000000..0f876194a
--- /dev/null
+++ b/libgda/libgda.deps.in
@@ -0,0 +1,2 @@
+libxml-2.0
+gio-2.0
\ No newline at end of file
diff --git a/libgda/meson.build b/libgda/meson.build
index 55e31b12f..c01dc9e3e 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -308,6 +308,13 @@ libgda_gir = gnome_module.generate_gir(libgda,
install_dir_typelib: join_paths(get_option('libdir'), 'girepository-1.0'),
)
if vapigen.found()
+ libgda_vala_deps = configure_file(
+ input: 'libgda.deps.in',
+ output: 'libgda-'+project_api_version+'.deps',
+ configuration: tconf,
+ install: true,
+ install_dir: join_paths(get_option('datadir'),'vala','vapi')
+ )
libgda_vapi = custom_target(project_package,
command: [vapigen,
'--girdir='+meson.current_source_dir(),
diff --git a/providers/skel-implementation/models/meson.build
b/providers/skel-implementation/models/meson.build
index 7b058e44d..6c8aab985 100644
--- a/providers/skel-implementation/models/meson.build
+++ b/providers/skel-implementation/models/meson.build
@@ -5,7 +5,7 @@ inc_libgda_modelsh_dep = declare_dependency (include_directories : inc_libgda_mo
models_xml_fnames = [
'models_specs_dsn',
]
-
+models_xml_res = []
foreach xt : models_xml_fnames
i18n.merge_file(
input: xt+'.xml.in',
@@ -13,6 +13,15 @@ foreach xt : models_xml_fnames
type: 'xml',
po_dir: join_paths(meson.build_root(),'po')
)
+ models_xml_res += custom_target(xt+'.raw.xml',
+ command: [raw_spec,
+ '-o', meson.current_build_dir(),
+ '@INPUT@'
+ ],
+ input: xt+'.xml.in',
+ output: xt+'.raw.xml',
+ )
+
# osf = configure_file(
# input: xt+'.xml.in',
# output: xt+'.xml',
@@ -23,17 +32,9 @@ foreach xt : models_xml_fnames
# )
endforeach
-foreach xr : models_xml_fnames
- tc = configuration_data()
- configure_file(
- input: xr+'.xml.in',
- output: xr+'.raw.xml',
- configuration: tc
- )
-endforeach
-
models_resources = gnome_module.compile_resources('models_resources', 'models.gresource.xml',
- source_dir: meson.current_build_dir()
+ source_dir: meson.current_build_dir(),
+ dependencies: models_xml_res
)
libgda_models_sources = files([
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]