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 /.gitlab-ci | |
| 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 '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/test-msys2-meson.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh index ce1768c4..37a0f913 100644 --- a/.gitlab-ci/test-msys2-meson.sh +++ b/.gitlab-ci/test-msys2-meson.sh @@ -38,7 +38,7 @@ export PATH="$HOME/.local/bin:$PATH" # Passing the full interpreter path works around the issue PYTHON="$(which python3)" export CFLAGS="-Werror" -meson -Dcairo=true -Ddoctool=true -Dpython="${PYTHON}" --buildtype debug _build +meson -Dcairo=enabled -Ddoctool=true -Dpython="${PYTHON}" --buildtype debug _build cd _build ninja |