nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use meson's standard approach to finding the messaging-menu library

Browse source 
Fixes FTB on master.
This commit is contained in:
Michael Gratton 2019-02-27 12:06:12 +11:00 • committed by Michael James Gratton
parent a0aa46b534
commit 3a9b2855ed
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -102,8 +102,8 @@ endif
# Optional dependencies
appstream_util = find_program('appstream-util', required: false)
desktop_file_validate = find_program('desktop-file-validate', required: false)
libmessagingmenu = dependency('libmessaging-menu', version: '>= 12.10', required: false)
libunity = dependency('unity', version: '>= 5.12.0', required: false)
libmessagingmenu = meson.get_compiler('c').find_library('libmessaging-menu', required: false)
# Ensure SQLite was built correctly
if not cc.has_header_symbol('sqlite3.h', 'SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER', dependencies: sqlite)

6
src/client/meson.build
View file

@ -130,13 +130,7 @@ geary_client_dependencies = [
geary_client_vala_options = geary_vala_options
if libmessagingmenu.found()
messagingmenu_vapi = meson.get_compiler('vala').find_library(
'MessagingMenu-1.0',
dirs: '/usr/share/vala/vapi',
required: true
)
geary_client_dependencies += libmessagingmenu
geary_client_dependencies += messagingmenu_vapi
geary_client_vala_options += ['-D', 'HAVE_LIBMESSAGINGMENU']
endif
if libunity.found()