diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2023-01-09 01:26:36 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2023-01-09 01:26:36 +0000 |
| commit | dc0aa4cc3e719510269db3f8c682de329b80bb38 (patch) | |
| tree | f14401bd4b03ee93387aec7c00302aa02e9ff3dd | |
| parent | afe5a5a51eb9cfd8254e0f9785b7482217824abb (diff) | |
| download | gobject-introspection-ebassi/cairo-wrap.tar.gz | |
build: Drop all the MSVC fallbacks for Cairoebassi/cairo-wrap
We can use a Meson subproject.
| -rw-r--r-- | meson.build | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/meson.build b/meson.build index ca9c2b22..122e95cd 100644 --- a/meson.build +++ b/meson.build @@ -161,26 +161,10 @@ cc.check_header('Python.h', dependencies: [python.dependency()], required: true) # cairo cairo_option = get_option('cairo') -if cc.get_id() == 'msvc' - if cairo_option.disabled() - req = cairo_option - else - req = false - endif - - cairo_dep = dependency('cairo', required: req) - cairo_gobject_dep = dependency('cairo-gobject', required: req) - - if 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', required: cairo_option) - cairo_gobject_dep = cc.find_library('cairo-gobject', required: cairo_option) - endif - endif -else - cairo_dep = dependency('cairo', required: cairo_option) - cairo_gobject_dep = dependency('cairo-gobject', required: cairo_option) -endif +cairo_dep = dependency('cairo', + required: get_option('cairo'), + default_options: ['zlib=enabled', 'tests=disabled']) +cairo_gobject_dep = dependency('cairo-gobject', required: get_option('cairo')) cairo_deps_found = cairo_gobject_dep.found() and cairo_dep.found() if not cairo_deps_found |