From 1d4734e02d0ff8c490ea9d2b27c59ff5e7538836 Mon Sep 17 00:00:00 2001 From: Daniel Espinosa Date: Sun, 28 Apr 2019 09:53:41 -0500 Subject: [PATCH] meson: add dependencies when used as subproject --- examples/c/meson.build | 2 +- examples/vala/meson.build | 2 +- gxml/meson.build | 6 ++++-- meson.build | 8 +++++--- test/meson.build | 12 ++++++------ 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/examples/c/meson.build b/examples/c/meson.build index 7bcf760b..1da79253 100644 --- a/examples/c/meson.build +++ b/examples/c/meson.build @@ -1,4 +1,4 @@ executable('document_new', 'document_new.c', link_with: [libgxml], - dependencies: [xml, gio, gee, inc_rooth_dep] + dependencies: [libgxml_deps, inc_rooth_dep] ) diff --git a/examples/vala/meson.build b/examples/vala/meson.build index 50b705ec..c9603fbe 100644 --- a/examples/vala/meson.build +++ b/examples/vala/meson.build @@ -1,4 +1,4 @@ executable('gxml-vala', 'example.vala', link_with: [libgxml], - dependencies: [xml, gio, gee, inc_rooth_dep] + dependencies: [libgxml_deps, inc_rooth_dep] ) diff --git a/gxml/meson.build b/gxml/meson.build index c5a3fefb..46c50b15 100644 --- a/gxml/meson.build +++ b/gxml/meson.build @@ -155,7 +155,7 @@ libgxml = library(VERSIONED_PROJECT_NAME, vala_header : PROJECT_NAME+'.h', vala_vapi : VAPI_NAME, vala_gir : GIR_NAME, - dependencies : [ gee, gio, xml, namespaceinfo_dep, inc_libh_dep, inc_rooth_dep ], + dependencies : [ libgxml_deps, namespaceinfo_dep, inc_libh_dep, inc_rooth_dep ], vala_args: [ '--abi-stability' ], @@ -191,4 +191,6 @@ endif libgxml_dep = declare_dependency(include_directories : inc_rooth, - link_with : libgxml) + link_with : libgxml, + dependencies: libgxml_deps, + ) diff --git a/meson.build b/meson.build index 69ca78dd..13817cde 100644 --- a/meson.build +++ b/meson.build @@ -7,9 +7,11 @@ VERSIONED_PROJECT_NAME = PROJECT_NAME+'-'+API_VERSION CAMEL_CASE_NAME = 'GXml' VERSIONED_CAMEL_CASE_NAME = CAMEL_CASE_NAME +'-'+ API_VERSION -xml = dependency('libxml-2.0') -gio = dependency('gio-2.0') -gee = dependency('gee-0.8') +libgxml_deps = [ + dependency('libxml-2.0'), + dependency('gio-2.0'), + dependency('gee-0.8') + ] VALADEPS = 'gee-0.8\ngio-2.0\nlibxml-2.0' PCDEPS = 'gee-0.8 gio-2.0 libxml-2.0' diff --git a/test/meson.build b/test/meson.build index 5006e8c3..ed62594e 100644 --- a/test/meson.build +++ b/test/meson.build @@ -57,7 +57,7 @@ endif t = executable('tests', files_tests + configvapi + configtestvapi, vala_args : [], c_args: tests_cargs, - dependencies : [ gio, gee, xml, inc_libh_dep, testdirs_dep, inc_rooth_dep], + dependencies : [ libgxml_deps, inc_libh_dep, testdirs_dep, inc_rooth_dep], link_with: libgxml ) @@ -70,7 +70,7 @@ feedreader_files = ([ feedreadert = executable('feedreader_tests', feedreader_files + configvapi + configtestvapi, vala_args : [], - dependencies : [ gio, gee, xml, inc_libh_dep, testdirs_dep, inc_rooth_dep], + dependencies : [ libgxml_deps, inc_libh_dep, testdirs_dep, inc_rooth_dep], link_with: libgxml ) @@ -83,7 +83,7 @@ files_gom_performance = files ([ gom_performance = executable('gom-performance-load', files_gom_performance + configvapi + configtestvapi, vala_args : [], - dependencies : [ gio, gee, xml, inc_libh_dep, testdirs_dep, inc_rooth_dep], + dependencies : [ libgxml_deps, inc_libh_dep, testdirs_dep, inc_rooth_dep], link_with: libgxml ) @@ -96,7 +96,7 @@ files_gom_performance_iterate = files ([ gom_performance_iterate = executable('gom-performance-iterate', files_gom_performance + configvapi + configtestvapi, vala_args : [], - dependencies : [ gio, gee, xml, inc_libh_dep, testdirs_dep, inc_rooth_dep], + dependencies : [ libgxml_deps, inc_libh_dep, testdirs_dep, inc_rooth_dep], link_with: libgxml ) @@ -108,7 +108,7 @@ files_libxml_performance = files ([ ]) libxml_performance = executable('libxml-performance-load', files_libxml_performance + configvapi + configtestvapi, vala_args : [], - dependencies : [ gio, gee, xml, inc_libh_dep, testdirs_dep, inc_rooth_dep], + dependencies : [ libgxml_deps, inc_libh_dep, testdirs_dep, inc_rooth_dep], link_with: libgxml ) @@ -120,7 +120,7 @@ files_libxml_performance_iterate = files ([ libxml_performance_iterate = executable('libxml-performance-iterate', files_gom_performance + configvapi + configtestvapi, vala_args : [], - dependencies : [ gio, gee, xml, inc_libh_dep, testdirs_dep, inc_rooth_dep], + dependencies : [ libgxml_deps, inc_libh_dep, testdirs_dep, inc_rooth_dep], link_with: libgxml ) -- GitLab