Remove plugin_hostlist:interface

6 files changed, 22 insertions, 19 deletions

diff --git a/lib/configuration/meson.build b/lib/configuration/meson.build
index 59ddb7a..fb2f02f 100644
--- a/lib/configuration/meson.build
+++ b/lib/configuration/meson.build
@@ -13,10 +13,10 @@ test('conf parser', executable('configuration-parser',
 )
 
 if meson.get_compiler('cpp').has_multi_arguments('-g', '-fsanitize=fuzzer')
-test('conf fuzzer', executable('configuration-fuzzer',
+executable('configuration-fuzzer',
   sources: 'configuration.cpp',
   cpp_args: [ '-g', '-fsanitize=fuzzer', '-DNO_QT_SPEC', '-DFUZZER' ],
-  link_args: [ '-fsanitize=fuzzer' ]),
-  args: [ '-seed=1', '-max_total_time=24', meson.current_source_dir()/'test/corpus' ]
+  link_args: [ '-fsanitize=fuzzer' ]
+#  args: [ '-seed=1', '-max_total_time=24', meson.current_source_dir()/'test/corpus' ]
 )
 endif
diff --git a/lib/session_formats/meson.build b/lib/session_formats/meson.build
index 9abf5a2..75ddd9c 100644
--- a/lib/session_formats/meson.build
+++ b/lib/session_formats/meson.build
@@ -1,8 +1,8 @@
 lib_session_formats = declare_dependency(
-  include_directories: [ '.', include ],
+  include_directories: [ '.', smolbote_interfaces ],
   link_with: library('sessionformats',
     [ 'session_json.cpp' ],
-    include_directories: include,
+    include_directories: smolbote_interfaces,
     dependencies: dep_qt5
   )
 )
diff --git a/meson.build b/meson.build
index 605fb64..c8f86a0 100644
--- a/meson.build
+++ b/meson.build
@@ -2,12 +2,18 @@ project('smolbote', ['cpp'],
     version: '0.1.0',
     default_options: ['cpp_std=c++2a', 'warning_level=3'],
     license: 'GPL3',
-    meson_version: '>=0.52.0'
+    meson_version: '>=0.53.0'
 )
 
+summary({
+  'prefix': get_option('prefix'),
+  'bindir': get_option('bindir'),
+  'libdir': get_option('libdir'),
+  'datadir': get_option('datadir')
+}, section: 'Install locations')
+
 kconfig = import('unstable-kconfig')
 kconf = kconfig.load(host_machine.system() + '/.config')
-
 cdata = configuration_data(kconf)
 
 version_h = vcs_tag(
@@ -60,21 +66,19 @@ poi_cpp_args = []
 
 dep_breakpad = dependency('breakpad-client', include_type: 'system', required: get_option('crashhandler'))
 dep_threads = dependency('threads', include_type: 'system', required: get_option('crashhandler'))
-if dep_breakpad.found()
-  poi_cpp_args += '-DHAVE_BREAKPAD'
-endif
 
 dep_gtest = dependency('gtest', required: false, disabler: true)
 dep_catch = dependency('catch2', required: true, fallback: ['catch2', 'catch2_dep'] )
 dep_SingleApplication = dependency('singleapplication', fallback: [ 'singleapplication', 'SingleApplication_dep' ])
 dep_args = dependency('args.hxx', fallback: [ 'args', 'args_dep' ])
 
-# Generate config header
-include = include_directories('include')
-
 poi_sourceset = sourceset.source_set()
 
-subdir('include')           # plugin interaces
+subdir('include')
+smolbote_interfaces = include_directories('include')
+install_headers('include/smolbote/plugininterface.h', 'include/smolbote/filterinterface.hpp', 'include/smolbote/session.hpp',
+  subdir: 'smolbote'
+)
 
 subdir('lib/bookmarks')
 subdir('lib/configuration')
@@ -93,14 +97,14 @@ subdir('test/matcherbenchmark')
 
 subdir('staging/smolblok')
 
-subproject('plugin_hostlist', default_options: 'interface=../../include')
+subproject('plugin_hostlist')
 
 ssconfig = poi_sourceset.apply(cdata)
 
 poi_exe = executable(get_option('poi'),
   cpp_args: ['-DQAPPLICATION_CLASS=QApplication', poi_cpp_args],
   sources: [ssconfig.sources()],
-  include_directories: [include, include_directories('src')],
+  include_directories: [ smolbote_interfaces, include_directories('src') ],
   dependencies: [ dep_qt5, dep_spdlog, dep_SingleApplication, dep_args, optional_deps, dep_bookmarks, dep_configuration, dep_downloads, dep_pluginloader, dep_urlfilter, ssconfig.dependencies(), lib_session_formats ],
   install: true,
 )
diff --git a/subprojects/plugin_hostlist/include b/subprojects/plugin_hostlist/include
new file mode 120000
index 0000000..3611dd2
--- /dev/null
+++ b/subprojects/plugin_hostlist/include
@@ -0,0 +1 @@
+../../include/
\ No newline at end of file
diff --git a/subprojects/plugin_hostlist/meson.build b/subprojects/plugin_hostlist/meson.build
index d8286d1..04711fd 100644
--- a/subprojects/plugin_hostlist/meson.build
+++ b/subprojects/plugin_hostlist/meson.build
@@ -7,8 +7,7 @@ dep_qt5 = dependency('qt5',
 )
 dep_catch = dependency('catch2', required: true, fallback: ['catch2', 'catch2_dep'] )
 
-smolbote_interface = include_directories(get_option('interface')) 
-message(get_option('interface'))
+smolbote_interface = include_directories('include')
 
 lib_hostlistfilter = static_library('hostlistfilter',
   [ 'filterlist.cpp' ],
diff --git a/subprojects/plugin_hostlist/meson_options.txt b/subprojects/plugin_hostlist/meson_options.txt
deleted file mode 100644
index e4aed19..0000000
--- a/subprojects/plugin_hostlist/meson_options.txt
+++ /dev/null
@@ -1 +0,0 @@
-option('interface', description: 'Interfaces path', type: 'string', value: '/usr/local/include')