[dia/neduard/meson_fixes: 26/26] #31: Add wmf and xslt plugins to install_plugins_desc.
- From: Eduard <neduard src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia/neduard/meson_fixes: 26/26] #31: Add wmf and xslt plugins to install_plugins_desc.
- Date: Fri, 15 Feb 2019 14:30:10 +0000 (UTC)
commit 7594708d2f00388388dd56484f9848ae3a2d4395
Author: Eduard <eddnicodei gmail com>
Date: Fri Feb 15 14:01:46 2019 +0000
#31: Add wmf and xslt plugins to install_plugins_desc.
- This also fixes issue with config.h not being found.
plug-ins/meson.build | 2 +-
plug-ins/wmf/meson.build | 15 ++++++---------
plug-ins/xslt/meson.build | 21 ++++++++++-----------
3 files changed, 17 insertions(+), 21 deletions(-)
---
diff --git a/plug-ins/meson.build b/plug-ins/meson.build
index 27808d31..69becd54 100644
--- a/plug-ins/meson.build
+++ b/plug-ins/meson.build
@@ -28,7 +28,7 @@ subdir('svg')
subdir('vdx')
# TODO: Port to Windows.
if host_machine.system() != 'windows'
- subdir('wmf') # Non-standard: Only installs if libemf present.
+ subdir('wmf')
endif
subdir('wpg')
subdir('xfig')
diff --git a/plug-ins/wmf/meson.build b/plug-ins/wmf/meson.build
index fa0e1a0d..f54ef7d8 100644
--- a/plug-ins/wmf/meson.build
+++ b/plug-ins/wmf/meson.build
@@ -12,12 +12,9 @@ if host_machine.system() == 'windows'
deps += [cc.find_library('comdlg32')]
endif
-library(
- 'wmf_filter',
- sources,
- dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep] + deps,
- include_directories: [libdia_inc, configuration_inc],
- link_with: [libdia],
- install: libemf_dep.found(),
- install_dir: dialibdir
-)
+install_plugins_desc += {
+ 'name': 'wmf_filter',
+ 'sources': sources,
+ 'extra_deps': deps,
+ 'install': libemf_dep.found(),
+}
diff --git a/plug-ins/xslt/meson.build b/plug-ins/xslt/meson.build
index f0fa51f9..877f2454 100644
--- a/plug-ins/xslt/meson.build
+++ b/plug-ins/xslt/meson.build
@@ -13,19 +13,18 @@ xsls = files(
'dia-uml2python.xsl',
'dia-uml2owl.xsl',
'stylesheets.xml',
- 'dia-uml2componentlist.xsl',
+ 'dia-uml2componentlist.xsl',
)
-install_data(xsls, install_dir: join_paths(pkgdatadir, 'xslt'))
+install_data(
+ xsls,
+ install_dir: join_paths(pkgdatadir, 'xslt')
+)
if libxslt_dep.found()
- library(
- 'xslt_filter',
- sources,
- dependencies: [libc_dep, libgtk_dep, libm_dep, libxml_dep, libxslt_dep],
- include_directories: [libdia_inc, configuration_inc],
- link_with: [libdia],
- install: true,
- install_dir: dialibdir
- )
+ install_plugins_desc += {
+ 'name': 'xslt_filter',
+ 'sources': sources,
+ 'extra_deps': [libxslt_dep],
+ }
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]