summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk-Jan C. Binnema <djcb@djcbsoftware.nl>2022-03-26 17:17:51 +0200
committerDirk-Jan C. Binnema <djcb@djcbsoftware.nl>2022-03-26 17:19:10 +0200
commitde80b557e8b8b342dc357b49d6ef1019c25680ad (patch)
tree4d43961b3a05f4ffcec49f3500dbabfebebab679
parent03993b93b27e82af2ed0b9487280d0fabe577a86 (diff)
meson: build updates
-rw-r--r--guile/tests/meson.build2
-rw-r--r--lib/meson.build6
2 files changed, 4 insertions, 4 deletions
diff --git a/guile/tests/meson.build b/guile/tests/meson.build
index a279345..1242638 100644
--- a/guile/tests/meson.build
+++ b/guile/tests/meson.build
@@ -15,7 +15,7 @@
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-guile_load_path=':'.join([
+guile_load_path=':'.join([ # meson 0.56 has project_source_root
join_paths(meson.source_root(), 'guile'),
join_paths(meson.current_build_dir(), '..')])
diff --git a/lib/meson.build b/lib/meson.build
index 930dc0b..a435bbf 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -77,18 +77,18 @@ lib_mu=static_library(
install: false)
# some of the libme headers include xapian
-xapian_incs = xapian_dep.get_pkgconfig_variable('includedir')
lib_mu_dep = declare_dependency(
link_with: lib_mu,
+ dependencies: [ lib_mu_message_dep ],
include_directories:
- include_directories(['.', '..', xapian_incs]))
+ include_directories(['.', '..']))
# test helpers
lib_test_mu_common=static_library('mu-test-common', [
'tests/test-mu-common.cc',
'tests/test-mu-common.hh'],
dependencies: [ glib_dep, thread_dep,
- config_h_dep])
+ config_h_dep ])
lib_test_mu_common_dep=declare_dependency(
link_with: lib_test_mu_common,
include_directories: include_directories(['tests']))