diff options
| author | Niklas Guertler <profclonk@gmail.com> | 2020-09-14 15:19:01 +0200 |
|---|---|---|
| committer | Niklas Guertler <profclonk@gmail.com> | 2020-09-14 15:19:01 +0200 |
| commit | f91c203bb40ef3024627c22710037bf67ac061cf (patch) | |
| tree | 92b8e6e16fc8dbfbf9dadafa15c4062b6fc865aa /meson_options.txt | |
| parent | 754bd1814d33ff374a4a265bd399549269f2ce06 (diff) | |
| download | pango-f91c203bb40ef3024627c22710037bf67ac061cf.tar.gz | |
Make dependencies to fontconfig and freetype optional and explicit.
Added meson features for explicitly enabling or disabling the dependencies freetype and fontconfig such that they won't be used even if present on the system.
The meson option use_fontconfig was changed to fontconfig with these possible values:
* 'enabled' (equivalent to old use_fontconfig=true)
* 'auto' (equivalent to old use_fontconfig=false)
* 'disabled' (equivalent to old use_fontconfig=false AND report an error if fontconfig is required on this system).
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/meson_options.txt b/meson_options.txt index 437ba149..5aa7c795 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,10 +10,10 @@ option('install-tests', description : 'Install tests', type: 'boolean', value: 'false') -option('use_fontconfig', - description : 'Force using FontConfig where it is optional, on Windows and macOS. This is ignored on platforms where it is required', - type: 'boolean', - value: 'false') +option('fontconfig', + description : 'Build with FontConfig support. Passing \'auto\' or \'disabled\' disables fontconfig where it is optional, i.e. on Windows and macOS. Passing \'disabled\' on platforms where fontconfig is required results in error.', + type: 'feature', + value: 'auto') option('sysprof', type : 'feature', value : 'disabled', @@ -30,3 +30,7 @@ option('xft', type : 'feature', value : 'auto', description : 'Build with xft support') +option('freetype', + type : 'feature', + value : 'auto', + description : 'Build with freetype support') |