[pygobject] meson: Follow up to make `pycairo` option a feature
- From: Christoph Reiter <creiter src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] meson: Follow up to make `pycairo` option a feature
- Date: Wed, 3 Jun 2020 22:35:39 +0000 (UTC)
commit 7d5f4cd41ee0221c13842ab6323b7a016df02c7e
Author: Thibault Saunier <tsaunier igalia com>
Date: Wed Jun 3 18:02:52 2020 -0400
meson: Follow up to make `pycairo` option a feature
meson.build | 10 +++++-----
1 file 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 = []
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]