From 428c5396867d8370e110d619a15b51b24d9bb664 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Thu, 23 Apr 2020 16:10:42 +0300 Subject: Remove plugin_hostlist:interface --- meson.build | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'meson.build') 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, ) -- cgit v1.2.1