From ad26ceaa536742060173257e661961bb26216e4e Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 24 Apr 2020 15:05:03 -0400 Subject: Revert "Revert "Meson: Fix build when glib is built as subproject"" This reverts commit 42b7d634a9a7500dcc71651f71844148fc200be3. --- girepository/cmph/meson.build | 2 ++ girepository/meson.build | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/girepository/cmph/meson.build b/girepository/cmph/meson.build index 5bc41a33..2a0cef7e 100644 --- a/girepository/cmph/meson.build +++ b/girepository/cmph/meson.build @@ -26,6 +26,7 @@ cmph_sources = [ cmph_deps = [ glib_dep, + gobject_dep, cc.find_library('m', required: false), ] @@ -67,6 +68,7 @@ cmph_test = executable('cmph-bdz-test', '../cmph-bdz-test.c', dependencies: [ cmph_dep, glib_dep, + gobject_dep, ], c_args: custom_c_args, ) diff --git a/girepository/meson.build b/girepository/meson.build index 204659fe..6cd8fd30 100644 --- a/girepository/meson.build +++ b/girepository/meson.build @@ -17,12 +17,13 @@ girepo_gthash_lib = static_library('girepository-gthash', cmph_dep, glib_dep, gmodule_dep, + gobject_dep, ], ) girepo_gthash_dep = declare_dependency( link_with: girepo_gthash_lib, - dependencies: [glib_dep, gmodule_dep], + dependencies: [glib_dep, gmodule_dep, gobject_dep], include_directories: include_directories('.'), ) -- cgit v1.2.1