From 478cdbbc5cc1c69a76e6f1054ce70f8ee0bb0a59 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 25 Dec 2018 23:58:38 +0100 Subject: Rename TabWidget::deleteTab to TabWidget::removeTab --- meson.build | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'meson.build') diff --git a/meson.build b/meson.build index 5452574..e5b542c 100644 --- a/meson.build +++ b/meson.build @@ -11,19 +11,26 @@ dep_qt5 = dependency('qt5', modules: ['Core', 'Network', 'Widgets', 'WebEngineWi dep_boost = dependency('boost', modules: ['program_options']) # Breakpad +if get_option('Breakpad').enabled() dep_breakpad = declare_dependency( compile_args: '-DBREAKPAD', - dependencies: [dependency('breakpad-client', required: get_option('Breakpad')), - dependency('threads', required: get_option('Breakpad'))] + dependencies: [dependency('breakpad-client'), + dependency('threads')] ) +else + dep_breakpad = declare_dependency() +endif # KDE +if get_option('Plasma').enabled() dep_plasma = declare_dependency( compile_args: '-DPLASMA', - dependencies: [meson.get_compiler('cpp').find_library('KF5WindowSystem', required: get_option('Plasma')), - meson.get_compiler('cpp').find_library('KF5Wallet', required: get_option('Plasma'))], - include_directories: [include_directories('/usr/include/KF5/KWindowSystem'), include_directories('/usr/include/KF5/KWallet')] + dependencies: [ dependency('KF5WindowSystem', method: 'cmake'), + dependency('KF5Wallet', method: 'cmake')] ) +else + dep_plasma = declare_dependency() +endif # add -DQT_NO_DEBUG to non-debug builds if not get_option('debug') -- cgit v1.2.1