diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-17 19:05:46 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-17 19:05:46 +0000 |
| commit | 25fedea4091818e39676e130f512214bf4192a8d (patch) | |
| tree | d74df18e47a22505c8b78abaf4efa285a1589774 /meson_options.txt | |
| parent | fc9c3c3628aef1ee0b646b9bd10f47cee1549ec4 (diff) | |
| parent | f91c203bb40ef3024627c22710037bf67ac061cf (diff) | |
| download | pango-25fedea4091818e39676e130f512214bf4192a8d.tar.gz | |
Merge branch 'optional-dependencies' into 'master'
Make dependencies to fontconfig and freetype optional and explicit.
See merge request GNOME/pango!239
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') |