Commit ae26dae8 authored by Eduard's avatar Eduard

#19: Port 'layout' plugin.

  - Add include directory of app/
  - Build configure file after processing all subdirs.
parent bee3343c
......@@ -72,6 +72,8 @@ if pkg_config_libdir != ''
dia_link_args += pkg_config_libdir
endif
diaapp_inc = include_directories('.')
executable('dia',
dia_sources + [dia_app_icons_h],
dependencies : [libgtk_dep, libxml_dep, libm_dep],
......
......@@ -58,8 +58,6 @@ foreach f : ['select', 'strcspn', 'strdup', 'strtol']
conf.set10('HAVE_' + f.underscorify().to_upper(), cc.has_function(f))
endforeach
configure_file(output : 'config.h',
configuration : conf)
configuration_inc = include_directories('.')
# FIXME: I don't think this should be defined.
......@@ -76,4 +74,7 @@ subdir('plug-ins')
subdir('sheets')
subdir('shapes')
configure_file(output : 'config.h',
configuration : conf)
meson.add_install_script('meson-helpers/post-install.py', datadir)
sources = files(
'dia-graph.cpp',
'layout.cpp',
'ogdf-simple.cpp'
'dia-graph.cpp',
'layout.cpp',
)
install_plugins_desc += [['layout_filter', sources, []]]
libogdf_dep = cc.find_library('ogdf', required: false)
deps = [libgtk_dep, libm_dep, libxml_dep]
#TODO: this needs to be tested.
if libogdf_dep.found() == true
conf.set('HAVE_OGDF', 1)
deps += [libogdf_dep]
sources += ['ogdf-simple.cpp']
endif
# Need to define it as shared module since it depends
# on symbols found in the dia *app* (which will be linked at run-time).
shared_module(
'layout_filter',
sources,
dependencies: deps,
include_directories: [libdia_inc, configuration_inc, diaapp_inc],
link_with: [libdia],
install: true,
install_dir: dialibdir
)
......@@ -4,21 +4,18 @@
# Fourth is whether to install or not
install_plugins_desc = []
# Note that most of these simply append to
# install_plugins_desc. Some however have
# non-standard compilations and therefore are
# marked as such.
subdir('cairo')
subdir('cgm')
# Note that this does not get installed
subdir('drs')
subdir('drs') # Non-standard: does not get installed.
subdir('dxf')
subdir('hpgl')
subdir('shape')
subdir('pixbuf')
# FIXME: requires OGDF
#subdir('layout')
subdir('layout') # Non-standard: shared_module
subdir('libart')
subdir('metapost')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment