summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-02-22 23:21:35 +0000
committerJan-Marek Glogowski <jan-marek.glogowski@extern.cib.de>2020-03-14 23:35:08 +0000
commit787f5c9fabac04eb3334a8f4785c20aa4b7e91f8 (patch)
treeb9884dd5f2c1d9ab8ed3c02d4352ff17beecaaea
parentbe1f3e4621a2eda792ca1955c87c35d5da347979 (diff)
Build needs mdds >= 0.15
Change-Id: Ib9d820d7bb4d55af3ca037e79cc6139f428e5399
-rw-r--r--meson.build5
-rw-r--r--sc/meson.build8
2 files changed, 6 insertions, 7 deletions
diff --git a/meson.build b/meson.build
index 3fdea454dd15..c540a6739a7a 100644
--- a/meson.build
+++ b/meson.build
@@ -172,10 +172,7 @@ kf5_i18n_dep = dependency('KF5I18n')
kf5_config_dep = dependency('KF5KIO', modules: 'KF5::ConfigCore')
kf5_winsys_dep = dependency('KF5WindowSystem')
-# The version in Ubuntu eoan is too old.
-#mdds_dep = dependency('mdds-1.5')
-mdds_dep = declare_dependency(include_directories: 'mdds')
-broken_mdds_dep = declare_dependency(include_directories: '.')
+mdds_dep = dependency('mdds-1.5')
# FIXME. Java does not provide .pc files.
# Presumably this data can be obtained via other methods.
diff --git a/sc/meson.build b/sc/meson.build
index ea99b2659bed..7be12d07a706 100644
--- a/sc/meson.build
+++ b/sc/meson.build
@@ -749,7 +749,7 @@ scui_lib = shared_library('scuilo',
utl_lib,
vcl_lib,
],
- dependencies: [broken_mdds_dep],
+ dependencies: [mdds_dep],
gnu_symbol_visibility: 'hidden',
install: true,
)
@@ -951,7 +951,7 @@ scfilt_lib = shared_library('scfilt',
vcl_lib,
i18nlangtag_lib,
],
- dependencies: [orcus_dep, broken_mdds_dep],
+ dependencies: [orcus_dep, mdds_dep],
install: true,
)
@@ -1045,7 +1045,9 @@ vbaobj_lib = shared_library('vbaobjlo',
vbahelper_lib,
vcl_lib,
],
- dependencies: [broken_mdds_dep],
+ dependencies: [
+ mdds_dep,
+ ],
gnu_symbol_visibility: 'hidden',
install: true,
)