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

meson: Update to 0.59

Browse source
This commit is contained in:
Maximiliano Sandoval R 2022-03-18 12:18:45 +01:00 • committed by Niels De Graef
parent fcece2a649
commit 080ead9775
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -1,7 +1,7 @@
project('geary', [ 'vala', 'c' ], project('geary', [ 'vala', 'c' ],
version: '43.dev', version: '43.dev',
license: 'LGPL2.1+', license: 'LGPL2.1+',
meson_version: '>= 0.55', meson_version: '>= 0.59',
) )
# Determine the type of build # Determine the type of build
@ -34,9 +34,9 @@ lib_dir = geary_prefix / get_option('libdir')
locale_dir = geary_prefix / get_option('localedir') locale_dir = geary_prefix / get_option('localedir')
# Source dirs # Source dirs
metadata_dir = meson.source_root() / 'bindings'/ 'metadata' metadata_dir = meson.project_source_root() / 'bindings'/ 'metadata'
po_dir = meson.source_root() / 'po' po_dir = meson.project_source_root() / 'po'
vapi_dir = meson.source_root() / 'bindings' / 'vapi' vapi_dir = meson.project_source_root() / 'bindings' / 'vapi'
# Compiler configuration # Compiler configuration
add_project_arguments([ add_project_arguments([
@ -153,7 +153,7 @@ if not libhandy.found()
libhandy_project.get_variable('libhandy_vapi') libhandy_project.get_variable('libhandy_vapi')
] ]
) )
libhandy_vapi = meson.build_root() / 'subprojects' / 'libhandy' / 'src' libhandy_vapi = meson.project_build_root() / 'subprojects' / 'libhandy' / 'src'
endif endif
# Optional dependencies # Optional dependencies

6
src/meson.build
View file

@ -5,8 +5,8 @@ conf = configuration_data()
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('G_LOG_DOMAIN', meson.project_name()) conf.set_quoted('G_LOG_DOMAIN', meson.project_name())
conf.set_quoted('_APP_ID', geary_id) conf.set_quoted('_APP_ID', geary_id)
conf.set_quoted('_BUILD_ROOT_DIR', meson.build_root()) conf.set_quoted('_BUILD_ROOT_DIR', meson.project_build_root())
conf.set_quoted('_GSETTINGS_DIR', meson.build_root() / 'desktop') conf.set_quoted('_GSETTINGS_DIR', meson.project_build_root() / 'desktop')
conf.set_quoted('_INSTALL_PREFIX', geary_prefix) conf.set_quoted('_INSTALL_PREFIX', geary_prefix)
conf.set_quoted('_ISO_CODE_3166_XML', iso_3166_xml) conf.set_quoted('_ISO_CODE_3166_XML', iso_3166_xml)
conf.set_quoted('_ISO_CODE_639_XML', iso_639_xml) conf.set_quoted('_ISO_CODE_639_XML', iso_639_xml)
@ -15,7 +15,7 @@ conf.set_quoted('_NAME_SUFFIX', name_suffix)
conf.set_quoted('_PLUGINS_DIR', plugins_dir) conf.set_quoted('_PLUGINS_DIR', plugins_dir)
conf.set_quoted('_PROFILE', profile) conf.set_quoted('_PROFILE', profile)
conf.set_quoted('_REVNO', revno) conf.set_quoted('_REVNO', revno)
conf.set_quoted('_SOURCE_ROOT_DIR', meson.source_root()) conf.set_quoted('_SOURCE_ROOT_DIR', meson.project_source_root())
conf.set_quoted('_VERSION', geary_version) conf.set_quoted('_VERSION', geary_version)
conf.set_quoted('_WEB_EXTENSIONS_DIR', web_extensions_dir) conf.set_quoted('_WEB_EXTENSIONS_DIR', web_extensions_dir)
configure_file(output: 'config.h', configuration: conf) configure_file(output: 'config.h', configuration: conf)