Sort meson config options

This commit is contained in:
Michael Gratton 2019-09-28 00:25:07 +10:00
parent af2915707d
commit cf8ea7e436
2 changed files with 59 additions and 14 deletions

View file

@ -7,13 +7,13 @@ project('geary', [ 'vala', 'c' ],
gnome = import('gnome')
i18n = import('i18n')
# Option
install_contractor_file = get_option('contractor')
iso_639_xml = get_option('iso_639_xml')
iso_3166_xml = get_option('iso_3166_xml')
reference_tracking = get_option('ref_tracking')
poodle = get_option('poodle')
# Build-time configuration options
enable_valadoc = get_option('valadoc')
install_contractor_file = get_option('contractor')
iso_3166_xml = get_option('iso_3166_xml')
iso_639_xml = get_option('iso_639_xml')
poodle = get_option('poodle')
reference_tracking = get_option('ref_tracking')
revno = run_command('build-aux/git_version.py').stdout().strip()

View file

@ -1,11 +1,50 @@
option('valadoc', type: 'boolean', value: false, description: 'Whether to build the documentaton (requires valadoc).')
option('contractor', type: 'boolean', value: false, description: 'Whether to install the contractor file (Elementary OS-specific).')
option('poodle', type: 'boolean', value: true, description: 'Whether to apply the POODLE SSLv3 fix.')
option('ref_tracking', type: 'boolean', value: false, description: 'Whether to use explicit reference tracking.')
option('iso_639_xml', type: 'string', value: '', description: 'Full path to the ISO 639 XML file.')
option('iso_3166_xml', type: 'string', value: '', description: 'Full path to the ISO 3166 XML file.')
option('libunwind_optional', type: 'boolean', value: false, description: 'Determines if libunwind is required.')
option('tnef-support', type: 'boolean', value: true, description: 'Whether to support TNEF attachments (requires libytnef).')
#
# General build options
#
option(
'contractor',
type: 'boolean',
value: false,
description: 'Whether to install the contractor file (Elementary OS-specific).'
)
option(
'iso_639_xml',
type: 'string',
value: '',
description: 'Full path to the ISO 639 XML file.'
)
option(
'iso_3166_xml',
type: 'string',
value: '',
description: 'Full path to the ISO 3166 XML file.'
)
option(
'libunwind_optional',
type: 'boolean',
value: false,
description: 'Determines if libunwind is required.'
)
option(
'poodle',
type: 'boolean',
value: true,
description: 'Whether to apply the POODLE SSLv3 fix.'
)
option(
'tnef-support',
type: 'boolean',
value: true,
description: 'Whether to support TNEF attachments (requires libytnef).'
)
option(
'valadoc',
type: 'boolean',
value: false,
description: 'Whether to build the documentaton (requires valadoc).'
)
# Development options
option(
'profile',
type: 'combo',
@ -13,3 +52,9 @@ option(
choices: ['default','development','beta'],
description: 'Specifies the application type to be built'
)
option(
'ref_tracking',
type: 'boolean',
value: false,
description: 'Whether to use explicit reference tracking.'
)