From 547d6a4a8ed5ac2e8d922c0c7cfb294e0a3ceed4 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 23 Oct 2018 11:53:50 +0200 Subject: Fix link errors --- lib/urlfilter/meson.build | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'lib/urlfilter') diff --git a/lib/urlfilter/meson.build b/lib/urlfilter/meson.build index 9178d1c..732b67f 100644 --- a/lib/urlfilter/meson.build +++ b/lib/urlfilter/meson.build @@ -1,17 +1,18 @@ urlfilter_inc = include_directories('.') -urlfilter_lib = static_library('urlfilter', - ['filtertree.cpp', 'filtertree.h', 'filterleaf.cpp', 'filterleaf.h', - 'domain.cpp', 'domain.h', - 'formats/adblockrule.cpp', 'formats/adblockrule.h', - 'formats/hostlistrule.cpp', 'formats/hostlistrule.h'], + +urlfilter_moc = qt5.preprocess( + moc_headers: ['filtertree.h', 'filterleaf.h', 'formats/adblockrule.h', 'formats/hostlistrule.h'], + dependencies: dep_qt5 +) + +urlfilter_lib = static_library('urlfilter', + ['filtertree.cpp', 'filterleaf.cpp', urlfilter_moc, + 'domain.cpp', 'domain.h', + 'formats/adblockrule.cpp', 'formats/hostlistrule.cpp', ], dependencies: dep_qt5 ) dep_urlfilter = declare_dependency( include_directories: urlfilter_inc, - link_with: urlfilter_lib, - sources: ['filtertree.cpp', 'filtertree.h', 'filterleaf.cpp', 'filterleaf.h', - 'domain.cpp', 'domain.h', - 'formats/adblockrule.cpp', 'formats/adblockrule.h', - 'formats/hostlistrule.cpp', 'formats/hostlistrule.h'] + link_with: urlfilter_lib ) -- cgit v1.2.1