summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorAdrian Johnson <ajohnson@redneon.com>2021-09-17 06:25:07 +0930
committerAdrian Johnson <ajohnson@redneon.com>2021-09-17 06:25:07 +0930
commit23815978cc6eb3b681788ab43c4d8f5979a39869 (patch)
tree11c01b67478887699cd56c4dd444445f64abd0c2 /meson.build
parentfea24631076f74a3202ba0233be85588ae28db36 (diff)
parent4c520fea2124f1d2d200ca86045f1de138809148 (diff)
downloadcairo-23815978cc6eb3b681788ab43c4d8f5979a39869.tar.gz
Merge branch 'master' into color-font-foreground-color
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 6236d743b..3c261d0ff 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('cairo', 'c', 'cpp',
- meson_version: '>= 0.54.0',
+ meson_version: '>= 0.56.0',
version: run_command(find_program('version.py'), check: true).stdout().strip(),
default_options: ['warning_level=2'],
)
@@ -964,7 +964,7 @@ subdir('src')
if feature_conf.get('CAIRO_HAS_PNG_FUNCTIONS', 0) == 1
subdir('boilerplate')
else
- cairoboilerplate_dep = dependency()
+ cairoboilerplate_dep = dependency('', required: false)
endif
subdir('util')