Revert "Revert "Meson: Fix build when glib is built as subproject""

This reverts commit 42b7d634a9a7500dcc71651f71844148fc200be3.
This commit is contained in:
Xavier Claessens 2020-04-24 15:05:03 -04:00
parent 3d39d61e3d
commit 74ff43c47f
2 changed files with 4 additions and 1 deletions

View File

@ -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,
)

View File

@ -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('.'),
)