summaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@igalia.com>2020-06-03 18:02:52 -0400
committerThibault Saunier <tsaunier@igalia.com>2020-06-03 18:05:02 -0400
commit7d5f4cd41ee0221c13842ab6323b7a016df02c7e (patch)
tree8efcf18164f396c7dbab03c019b194cc90ca33b4 /meson.build
parent505c4b22d58d1e0e9a4dae53f1b55a9a4a39d945 (diff)
downloadpygobject-7d5f4cd41ee0221c13842ab6323b7a016df02c7e.tar.gz
meson: Follow up to make `pycairo` option a feature
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build10
1 files changed, 5 insertions, 5 deletions
diff --git a/meson.build b/meson.build
index 4826600c..7d543216 100644
--- a/meson.build
+++ b/meson.build
@@ -44,13 +44,13 @@ with_pycairo = get_option('pycairo')
cc = meson.get_compiler('c')
if not with_pycairo.disabled()
- cairo_dep = dependency('cairo', required: cc.get_id() != 'msvc')
- cairo_gobject_dep = dependency('cairo-gobject', required: cc.get_id() != 'msvc')
+ cairo_dep = dependency('cairo', required: with_pycairo.enabled() and cc.get_id() != 'msvc')
+ cairo_gobject_dep = dependency('cairo-gobject', required: with_pycairo.enabled() and cc.get_id() != 'msvc')
if cc.get_id() == 'msvc' and (not cairo_gobject_dep.found() or not cairo_dep.found())
if cc.has_header('cairo.h') and cc.has_header ('cairo-gobject.h')
- cairo_dep = cc.find_library ('cairo')
- cairo_gobject_dep = cc.find_library ('cairo-gobject')
+ cairo_dep = cc.find_library ('cairo', required: with_pycairo)
+ cairo_gobject_dep = cc.find_library ('cairo-gobject', required: with_pycairo)
endif
endif
@@ -62,7 +62,7 @@ if not with_pycairo.disabled()
required: with_pycairo,
)
else
- pycairo_dep = dependency('', required: false)
+ cairo_dep = dependency('', required: false)
endif
main_c_args = []