diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2019-09-28 12:27:13 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2019-09-28 12:31:01 +0200 |
| commit | 1cb3b2b27f824f3bbdab1a2e3fedf45a39689019 (patch) | |
| tree | 77316a989ea260f0976fc32321c5d7dbdc46cbea /tests | |
| parent | aec85eaf4d41fbc82889a2dfe1c0e672f036cbae (diff) | |
| download | gobject-introspection-1cb3b2b27f824f3bbdab1a2e3fedf45a39689019.tar.gz | |
meson: change "cairo" from a boolean to a feature option
We require cairo only to run all tests and thus default it to false.
This usually results in developers not using it when working on changes and
tests depending on cairo then failing in CI.
This changes it to a feature option that defaults to auto, so that devs that
have cairo headers installed will automatically use it.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scanner/meson.build | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/scanner/meson.build b/tests/scanner/meson.build index a028e3d2..022d1829 100644 --- a/tests/scanner/meson.build +++ b/tests/scanner/meson.build @@ -87,7 +87,7 @@ if cc.get_id() != 'msvc' ]) endif -if with_cairo +if cairo_deps_found regress_deps = [cairo_dep, cairo_gobject_dep] regress_c_args = [] else @@ -455,7 +455,7 @@ if glib_dep.type_name() == 'pkgconfig' command: gircompiler_command, ) - if with_cairo + if cairo_deps_found regress_scanner_cairo_args = ['--include=cairo-1.0'] else regress_scanner_cairo_args = ['-D_GI_DISABLE_CAIRO',] @@ -492,7 +492,7 @@ if glib_dep.type_name() == 'pkgconfig' # The reference gir is generated with cairo support, so we can only compare # things if we build with cairo as well - if with_cairo + if cairo_deps_found test_girs += regress_gir endif @@ -527,7 +527,7 @@ if with_doctool and glib_dep.type_name() == 'pkgconfig' 'generate-docs-' + language, input: regress_gir, depends: [doc_templates], - build_by_default: not with_cairo, + build_by_default: not cairo_deps_found, output: 'Regress-1.0-' + language, command: [ python, girdoctool, @@ -537,7 +537,7 @@ if with_doctool and glib_dep.type_name() == 'pkgconfig' '@INPUT@', '-o', '@OUTPUT@'], ) - if with_cairo + if cairo_deps_found test( 'gi-tester-docs-Regress-1.0-' + language, python, @@ -555,7 +555,7 @@ if with_doctool and glib_dep.type_name() == 'pkgconfig' 'generate-docs-sections', input: regress_gir, depends: [doc_templates], - build_by_default: not with_cairo, + build_by_default: not cairo_deps_found, output: 'Regress-1.0-sections.txt', command: [ python, girdoctool, @@ -565,7 +565,7 @@ if with_doctool and glib_dep.type_name() == 'pkgconfig' '@INPUT@', '-o', '@OUTPUT@'], ) - if with_cairo + if cairo_deps_found test( 'gi-tester-docs-Regress-1.0-sections.txt', python, |